X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/36467cea4ae3e92adbf20069a180a5fe1878fb21..24bd5bee4f5c1fd8a06385971996e0dc439c76d1:/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 66616a8660ca..0af122132f2e 100644 --- a/typo3/sysext/em/classes/settings/class.tx_em_settings.php +++ b/typo3/sysext/em/classes/settings/class.tx_em_settings.php @@ -42,12 +42,13 @@ class tx_em_Settings implements t3lib_Singleton { /** - * Develop commands + * Settings array * - * @var string + * @var array */ protected $settings; + /** * Constructor * @@ -97,6 +98,14 @@ class tx_em_Settings implements t3lib_Singleton { * @return void */ 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'), @@ -156,6 +165,7 @@ class tx_em_Settings implements t3lib_Singleton { 'mainTab' => '0', ); $this->settings = t3lib_BEfunc::getModuleData($this->MOD_MENU, t3lib_div::_GP('SET'), 'tools_em'); + $this->settings = array_merge($this->settings, $globalSettings); } /**