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

[Packages/TYPO3.CMS.git] / typo3 / sysext / em / classes / settings / class.tx_em_settings.php

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'),