[TASK] Use better implementation for array check 98/35398/2
authorAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 13 Dec 2014 14:47:17 +0000 (15:47 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 13 Dec 2014 19:06:51 +0000 (20:06 +0100)
commit8149f0a50a05ad5bbc318fd7e8270af5e328b24b
tree7ba82f938fcca8ab5c2f1ce9289ea8c5cac1cad8
parentece45f3c8c76d5ed09e41cff2decf25cb744e39f
[TASK] Use better implementation for array check

To suppress PHP warnings the input parameter must always be an array.
If there is nothing to merge, the array_merge_overrule function
must not be called at all.

Change-Id: Ice369449da22ff62c09efa919272195bd141e836
Resolves: #63827
Relates: #63701
Releases: master, 6.2
Reviewed-on: http://review.typo3.org/35398
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php