2010-09-26 Sebastian Kurfuerst <sebastian@typo3.org>

        * Fixed bug #9892: Extbase: broke switchableControllerAndActions (due to a merge failure of Extbase trunk into the Core)

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8902 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 3773f09..066cf11 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-26  Sebastian Kurfuerst  <sebastian@typo3.org>
+
+       * Fixed bug #9892: Extbase: broke switchableControllerAndActions (due to a merge failure of Extbase trunk into the Core)
+
 2010-09-25  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #15430: htmlArea RTE: Text not editable after pasting with server-based cleaning

diff --git a/typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php b/typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php
index af72757..2ec9c50 100644 (file)
--- a/typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php
+++ b/typo3/sysext/extbase/Classes/MVC/Web/RequestBuilder.php
@@ -92,10 +92,10 @@ class Tx_Extbase_MVC_Web_RequestBuilder {
                }
                $allowedControllerActions = array();
                if (is_array($configuration['switchableControllerActions'])) {
-                       foreach ($configuration['switchableControllerActions'] as $controllerConfiguration) {
-                               $controllerActions = t3lib_div::trimExplode(',', $controllerConfiguration['actions']);
+                       foreach ($configuration['switchableControllerActions'] as $controller => $controllerConfiguration) {\r
+                               $controllerActions = t3lib_div::trimExplode(',', $controllerConfiguration['actions'], TRUE);\r
                                foreach ($controllerActions as $actionName) {
-                                       $allowedControllerActions[$controllerConfiguration['controller']][] = $actionName;
+                                       $allowedControllerActions[$controller][] = $actionName;\r
                                }
                        }
                }