[+TASK] Extbase (MVC): Removed duplicated code from RequestBuilder. Thanks to Peter...
authorJochen Rau <jochen.rau@typoplanet.de>
Thu, 27 Jan 2011 15:47:33 +0000 (10:47 -0500)
committerJochen Rau <jochen.rau@typoplanet.de>
Thu, 27 Jan 2011 15:47:33 +0000 (10:47 -0500)
Resolves #12569.

Change-Id: I4bc732dfa20ffde40d96012c6534de11bad6ec5f

typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php

index de63f20..af8e623 100644 (file)
@@ -111,14 +111,11 @@ class Tx_Extbase_MVC_Web_RequestBuilder implements t3lib_Singleton {
                }
                $this->extensionName = $configuration['extensionName'];
                $this->pluginName = $configuration['pluginName'];
-
-               $frameworkConfiguration = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
-               $controllerConfiguration = $frameworkConfiguration['controllerConfiguration'];
-               $this->defaultControllerName = current(array_keys($controllerConfiguration));
-               $this->defaultActionName = current($controllerConfiguration[$this->defaultControllerName]['actions']);
+               $this->defaultControllerName = current(array_keys($configuration['controllerConfiguration']));
+               $this->defaultActionName = current($configuration['controllerConfiguration'][$this->defaultControllerName]['actions']);
 
                $allowedControllerActions = array();
-               foreach ($controllerConfiguration as $controllerName => $controllerActions) {
+               foreach ($configuration['controllerConfiguration'] as $controllerName => $controllerActions) {
                        $allowedControllerActions[$controllerName] = $controllerActions['actions'];
                }
                $this->allowedControllerActions = $allowedControllerActions;