[+BUGFIX] Extbase: Concept of registering extBase BE modules caused massive php warni...
authorJochen Rau <j.rau@web.de>
Thu, 27 May 2010 08:27:22 +0000 (08:27 +0000)
committerJochen Rau <j.rau@web.de>
Thu, 27 May 2010 08:27:22 +0000 (08:27 +0000)
typo3/sysext/extbase/Classes/Dispatcher.php
typo3/sysext/extbase/Classes/Utility/Extension.php

index 0ee4329..4d051e3 100644 (file)
@@ -321,8 +321,8 @@ class Tx_Extbase_Dispatcher {
         * @return void
         */
        public function callModule($module) {
-               if (isset($GLOBALS['TBE_MODULES'][$module])) {
-                       $config = $GLOBALS['TBE_MODULES'][$module];
+               if (isset($GLOBALS['TBE_MODULES']['_configuration'][$module])) {
+                       $config = $GLOBALS['TBE_MODULES']['_configuration'][$module];
 
                        // Check permissions and exit if the user has no permission for entry
                        $GLOBALS['BE_USER']->modAccess($config, TRUE);
@@ -355,7 +355,7 @@ class Tx_Extbase_Dispatcher {
         * @return array The controller/action pair to use for current call
         */
        protected function resolveControllerAction($module) {
-               $configuration = $GLOBALS['TBE_MODULES'][$module];
+               $configuration = $GLOBALS['TBE_MODULES']['_configuration'][$module];
                $fallbackControllerAction = $this->getFallbackControllerAction($configuration);
 
                        // Extract dispatcher settings from request
@@ -468,7 +468,7 @@ class Tx_Extbase_Dispatcher {
                        $controllerAction['actionName'] = $matches[2];
                } else {
                                // Support for external SCbase module function rendering
-                       $functions = $GLOBALS['TBE_MODULES_EXT'][$module]['MOD_MENU']['function'];
+                       $functions = $GLOBALS['TBE_MODULES_EXT']['_configuration'][$module]['MOD_MENU']['function'];
                        if (isset($functions[$moduleFunction])) {
                                $controllerAction['controllerName'] = $defaultController;
                                $controllerAction['actionName'] = 'extObj';
@@ -488,7 +488,7 @@ class Tx_Extbase_Dispatcher {
         * @return string The module rendered view
         */
        protected function transfer($module, $controller, $action) {
-               $config = $GLOBALS['TBE_MODULES'][$module];
+               $config = $GLOBALS['TBE_MODULES']['_configuration'][$module];
 
                $extbaseConfiguration = array(
                        'userFunc' => 'tx_extbase_dispatcher->dispatch',
index 4561134..6211106 100644 (file)
@@ -187,7 +187,7 @@ tt_content.list.20.' . $pluginSignature . ' {
         */
        public function configureModule($key, $fullpath, array $MCONF = array(), array $MLANG = array()) {
                $path = preg_replace('/\/[^\/.]+\/\.\.\//', '/', $fullpath); // because 'path/../path' does not work
-               $config = $GLOBALS['TBE_MODULES'][$key]['config'];
+               $config = $GLOBALS['TBE_MODULES']['_configuration'][$key]['config'];
                define('TYPO3_MOD_PATH', $config['extRelPath']);
 
                        // Fill $MCONF
@@ -308,8 +308,8 @@ tt_content.list.20.' . $pluginSignature . ' {
                        'controllerActions' => $controllerActions,
                        'config' => $config,
                );
-               $GLOBALS['TBE_MODULES'][$key] = $moduleConfig;
-               $GLOBALS['TBE_MODULES'][$key]['configureModuleFunction'] = array('Tx_Extbase_Utility_Extension', 'configureModule');
+               $GLOBALS['TBE_MODULES']['_configuration'][$key] = $moduleConfig;
+               $GLOBALS['TBE_MODULES']['_configuration'][$key]['configureModuleFunction'] = array('Tx_Extbase_Utility_Extension', 'configureModule');
 
                t3lib_extMgm::addModule($main, $sub, $position);
        }