From 09bd80f4d0a2a48613a5166d49dca021bddb2c3e Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 7 Jul 2015 11:38:55 +0200 Subject: [PATCH] Aliasing the default controller could cause an infinite loop --- .../install/files/lib/system/request/RequestHandler.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php index eebd1982f7..ce04280255 100644 --- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php @@ -178,7 +178,7 @@ class RequestHandler extends SingletonFactory { } // handle controller aliasing - if (!URL_LEGACY_MODE && isset($routeData['controller'])) { + if (empty($routeData['isImplicitController']) && !URL_LEGACY_MODE && isset($routeData['controller'])) { $ciController = mb_strtolower($routeData['controller']); // aliased controller, redirect to new URL @@ -289,6 +289,8 @@ class RequestHandler extends SingletonFactory { return; } + if (empty($routeData['controller'])) $routeData['isImplicitController'] = true; + // resolve implicit application abbreviation for landing page controller $landingPageApplication = $landingPage->getApplication(); $primaryApplication = ApplicationHandler::getInstance()->getPrimaryApplication(); -- 2.20.1