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

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10621 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 42fd416..374d868 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2011-02-24  Steffen Kamper  <steffen@typo3.org>
 
 2011-02-24  Steffen Kamper  <steffen@typo3.org>
 

+       * Fixed bug #13310: PHP Warning "array_merge(): Argument #2 is not an array" in class.tx_em_settings.php

        * Renewed fix #17701: Generated t3x are corrupted in 4.5.1-dev and trunk
 
 2011-02-23  Oliver Hader  <oliver.hader@typo3.org>
        * Renewed fix #17701: Generated t3x are corrupted in 4.5.1-dev and trunk
 
 2011-02-23  Oliver Hader  <oliver.hader@typo3.org>

diff --git a/typo3/sysext/em/classes/settings/class.tx_em_settings.php b/typo3/sysext/em/classes/settings/class.tx_em_settings.php
index e73fb00..0af1221 100644 (file)
--- a/typo3/sysext/em/classes/settings/class.tx_em_settings.php
+++ b/typo3/sysext/em/classes/settings/class.tx_em_settings.php
@@ -99,6 +99,13 @@ class tx_em_Settings implements t3lib_Singleton {
         */
        protected function readSettings() {
                $globalSettings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['em']);
         */
        protected function readSettings() {
                $globalSettings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['em']);

+               if (!is_array($globalSettings)) {
+                       $globalSettings = array(
+                               'displayMyExtensions' => 0,
+                               'selectedLanguages' => array(),
+                               'inlineToWindow' => 1,
+                       );
+               }

                $this->MOD_MENU = array(
                        'function' => array(
                                'loaded_list' => $GLOBALS['LANG']->getLL('menu_loaded_extensions'),
                $this->MOD_MENU = array(
                        'function' => array(
                                'loaded_list' => $GLOBALS['LANG']->getLL('menu_loaded_extensions'),