Fixed bug #13310: PHP Warning "array_merge(): Argument #2 is not an array" in class...
authorsteffenk <steffenk@709f56b5-9817-0410-a4d7-c38de5d9e867>
Thu, 24 Feb 2011 19:16:22 +0000 (19:16 +0000)
committersteffenk <steffenk@709f56b5-9817-0410-a4d7-c38de5d9e867>
Thu, 24 Feb 2011 19:16:22 +0000 (19:16 +0000)
commit24bd5bee4f5c1fd8a06385971996e0dc439c76d1
tree780c69aa3030cb5716abb301251dd26a21517a9d
parente176d71cd6631316a3e90f809d6d2a8313975a74
Fixed bug #13310: PHP Warning "array_merge(): Argument #2 is not an array" in class.tx_em_settings.php

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10621 709f56b5-9817-0410-a4d7-c38de5d9e867
ChangeLog
typo3/sysext/em/classes/settings/class.tx_em_settings.php