diff --git a/t3lib/class.t3lib_loadmodules.php b/t3lib/class.t3lib_loadmodules.php index 0813cea23387a25dc2fdbfe16e0b003d6a4966ac..507b1b4a094c2cc045b6a877ccfd9ca16689c909 100644 --- a/t3lib/class.t3lib_loadmodules.php +++ b/t3lib/class.t3lib_loadmodules.php @@ -86,7 +86,6 @@ class t3lib_loadModules { } /* - $modulesArray might look like this when entering this function. Notice the two modules added by extensions - they have a path attached @@ -104,19 +103,11 @@ class t3lib_loadModules { ) ) + */ - */ - // + // Collect required module meta information $this->absPathArray = $modulesArray['_PATHS']; - unset($modulesArray['_PATHS']); - // unset the array for calling external backend module dispatchers in typo3/mod.php - unset($modulesArray['_dispatcher']); - // unset the array for calling backend modules based on external backend module dispatchers in typo3/mod.php - unset($modulesArray['_configuration']); - $this->navigationComponents = $modulesArray['_navigationComponents']; - unset($modulesArray['_navigationComponents']); - $theMods = $this->parseModulesArray($modulesArray); /* @@ -402,7 +393,12 @@ class t3lib_loadModules { $theMods = array(); if (is_array($arr)) { foreach ($arr as $mod => $subs) { - $mod = $this->cleanName($mod); // clean module name to alphanum + // Module names must not start with an underline character + if (strpos($mod, '_') === 0) { + continue; + } + // Module names must be alpha-numeric + $mod = $this->cleanName($mod); if ($mod) { if ($subs) { $subsArr = t3lib_div::trimExplode(',', $subs); diff --git a/typo3/backend.php b/typo3/backend.php index 334a5290205fcc25f86e83d86379db41305a079f..52fd7249bd426e56536bf53b03190afd5a853d85 100644 --- a/typo3/backend.php +++ b/typo3/backend.php @@ -155,7 +155,7 @@ class TYPO3backend { $this->executeHook('constructPostProcess'); // Add previously generated JS to the backend - if (is_array($GLOBALS['TBE_MODULES']['_JSINIT'])) { + if (isset($GLOBALS['TBE_MODULES']['_JSINIT']) && is_array($GLOBALS['TBE_MODULES']['_JSINIT'])) { foreach ($GLOBALS['TBE_MODULES']['_JSINIT'] as $value) { $this->js .= $value; } diff --git a/typo3/js/extjs/iframepanel.js b/typo3/js/extjs/iframepanel.js index db2708396f3b1f64a4d28ea79a4465c9accf1141..ab517aa267ee88834706551cf553eeccc3ca1a34 100644 --- a/typo3/js/extjs/iframepanel.js +++ b/typo3/js/extjs/iframepanel.js @@ -96,14 +96,14 @@ TYPO3.iframePanel = Ext.extend(Ext.Panel, { // Some modules generate wrong url with unneeded string at the end if (currentSource.substr(currentSource.length-1) == '?' || currentSource.substr(currentSource.length-1) == '&') { - currentSource = currentSource.substr(0,currentSource.length) + currentSource = currentSource.substr(0, currentSource.length) } - if (currentSource.substr(0,1) == '/') { + if (currentSource.substr(0, 1) == '/') { currentSource = currentSource.substr(1); } if (source.substr(source.length-1) == '?' || source.substr(source.length-1) == '&') { - source = source.substr(0,source.length-1) + source = source.substr(0, source.length-1) } // Check if new uri should be loaded diff --git a/typo3/js/extjs/viewportConfiguration.js b/typo3/js/extjs/viewportConfiguration.js index c3b9d9c29bbd9aa8b52623663599dcd43d5e9309..5bfb98821d6572a9c4c92bbcdb8aacc6895b35e5 100644 --- a/typo3/js/extjs/viewportConfiguration.js +++ b/typo3/js/extjs/viewportConfiguration.js @@ -39,14 +39,14 @@ TYPO3.Viewport.ContentCards = { * Add a card to either the config or if already rendered to the wrapper */ addContentCard: function(name,config) { - config.id='typo3-card-'+name; + config.id = 'typo3-card-' + name; if (Ext.ready) { Ext.getCmp('typo3-contentContainerWrapper').add(config); } else { this.cards.push(config); } }, - cards:[ + cards: [ { id: 'typo3-contentContainer', border: false, diff --git a/typo3/js/modulemenu.js b/typo3/js/modulemenu.js index ce02b248642825b695aa790c85126e33b8322f09..9cbeec5513e21618134c1b78474689b3c8b55d27 100644 --- a/typo3/js/modulemenu.js +++ b/typo3/js/modulemenu.js @@ -223,6 +223,7 @@ TYPO3.ModuleMenu.App = { }, loadModuleComponents: function(record, params) { + var url; var mod = record.name; if (record.navigationComponentId) { this.loadNavigationComponent(record.navigationComponentId); @@ -320,6 +321,8 @@ TYPO3.ModuleMenu.App = { }, openInContentFrame: function(url, params) { + var urlToLoad, relatedCard; + if (top.nextLoadModuleUrl) { urlToLoad = top.nextLoadModuleUrl; top.nextLoadModuleUrl = '';