Fixed bug #13310: PHP Warning "array_merge(): Argument #2 is not an array" in...

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