[BUGFIX] Subrequests can't be resolved

This patch fixes the resolution of the controller object name when using
widget controller.

Change-Id: I003e7d6c7893b3519252f69b097375b741c5cf73
Fixes: #40157
Related: #40095
Releases: 6.0
Reviewed-on: http://review.typo3.org/14059
Reviewed-by: Thomas Maroschik
Tested-by: Thomas Maroschik
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn

diff --git a/typo3/sysext/extbase/Classes/Mvc/Request.php b/typo3/sysext/extbase/Classes/Mvc/Request.php
index 700ada9..4ef6710 100644 (file)
--- a/typo3/sysext/extbase/Classes/Mvc/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Request.php
@@ -171,17 +171,20 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface {
         */
        public function setControllerObjectName($controllerObjectName) {
                $matches = array();
-               preg_match('/
-                       ^Tx
-                       _(?P<extensionName>[^_]+)
-                       _
-                       (
-                               Controller
-                       |
-                               (?P<subpackageKey>.+)_Controller
-                       )
-                       _(?P<controllerName>[a-z_]+)Controller
-                       $/ix', $controllerObjectName, $matches);
+               if (strpos($controllerObjectName, '\\') !== FALSE) {
+                       if (substr($controllerObjectName, 0, 9) === 'TYPO3\CMS') {
+                               $extensionName = '^[^\\\]+\\\[^\\\]+\\\(?P<extensionName>[^\\\]+)';
+                       } else {
+                               $extensionName = '^[^\\\]+\\\(?P<extensionName>[^\\\]+)';
+                       }
+                       preg_match('/' .
+                               $extensionName.'\\\(Controller|(?P<subpackageKey>.+)\\\Controller)\\\(?P<controllerName>[a-z\\\]+)Controller
+                               $/ix', $controllerObjectName, $matches);
+               } else {
+                       preg_match('/
+                               ^Tx_(?P<extensionName>[^_]+)_(Controller|(?P<subpackageKey>.+)_Controller)_(?P<controllerName>[a-z_]+)Controller
+                               $/ix', $controllerObjectName, $matches);
+               }
                $this->controllerExtensionName = $matches['extensionName'];
                $this->controllerSubpackageKey = isset($matches['subpackageKey']) ? $matches['subpackageKey'] : NULL;
                $this->controllerName = $matches['controllerName'];