From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 7 Jul 2015 09:38:55 +0000 (+0200)
Subject: Aliasing the default controller could cause an infinite loop
X-Git-Tag: 2.1.6~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=09bd80f4d0a2a48613a5166d49dca021bddb2c3e;p=GitHub%2FWoltLab%2FWCF.git

Aliasing the default controller could cause an infinite loop
---

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();