diff --git a/typo3/sysext/em/classes/tools/class.tx_em_tools.php b/typo3/sysext/em/classes/tools/class.tx_em_tools.php index 616de29972d2b741a14be48e79e8e8d2c790c90b..4618a8c5315917031a8f79c2f15a0a96f0c4e8d6 100644 --- a/typo3/sysext/em/classes/tools/class.tx_em_tools.php +++ b/typo3/sysext/em/classes/tools/class.tx_em_tools.php @@ -135,22 +135,16 @@ final class tx_em_Tools { * @return void */ public static function refreshGlobalExtList() { - global $TYPO3_LOADED_EXT; - - $TYPO3_LOADED_EXT = t3lib_extMgm::typo3_loadExtensions(); - if ($TYPO3_LOADED_EXT['_CACHEFILE']) { - require(PATH_typo3conf . $TYPO3_LOADED_EXT['_CACHEFILE'] . '_ext_localconf.php'); - } - return; - $GLOBALS['TYPO3_LOADED_EXT'] = t3lib_extMgm::typo3_loadExtensions(); - if ($TYPO3_LOADED_EXT['_CACHEFILE']) { - require(PATH_typo3conf . $TYPO3_LOADED_EXT['_CACHEFILE'] . '_ext_localconf.php'); + if ($GLOBALS['TYPO3_LOADED_EXT']['_CACHEFILE']) { + require(PATH_typo3conf . $GLOBALS['TYPO3_LOADED_EXT']['_CACHEFILE'] . '_ext_localconf.php'); } else { - $temp_TYPO3_LOADED_EXT = $TYPO3_LOADED_EXT; + $temp_TYPO3_LOADED_EXT = $GLOBALS['TYPO3_LOADED_EXT']; foreach ($temp_TYPO3_LOADED_EXT as $_EXTKEY => $temp_lEDat) { if (is_array($temp_lEDat) && $temp_lEDat['ext_localconf.php']) { - $_EXTCONF = $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY]; + // Make sure $TYPO3_CONF_VARS is also available within the included files + global $TYPO3_CONF_VARS; + $_EXTCONF = $TYPO3_CONF_VARS['EXT']['extConf'][$_EXTKEY]; require($temp_lEDat['ext_localconf.php']); } }