From e6e54af29787d2605a963645e9f4bfa502c90e59 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 27 Dec 2012 01:19:05 +0100
Subject: [PATCH] Fixed routes not properly handling ACP requests

---
 .../files/lib/system/request/RequestHandler.class.php        | 3 +--
 wcfsetup/install/files/lib/system/request/Route.class.php    | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index 32839ea4f9..6c49d06fb6 100644
--- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
@@ -1,13 +1,12 @@
 <?php
 namespace wcf\system\request;
-use wcf\util\StringUtil;
-
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\SystemException;
 use wcf\system\menu\page\PageMenu;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
+use wcf\util\StringUtil;
 
 /**
  * Handles http requests.
diff --git a/wcfsetup/install/files/lib/system/request/Route.class.php b/wcfsetup/install/files/lib/system/request/Route.class.php
index 04bb8462b4..91847511b5 100644
--- a/wcfsetup/install/files/lib/system/request/Route.class.php
+++ b/wcfsetup/install/files/lib/system/request/Route.class.php
@@ -1,8 +1,7 @@
 <?php
 namespace wcf\system\request;
-use wcf\system\menu\page\PageMenu;
-
 use wcf\system\exception\SystemException;
+use wcf\system\menu\page\PageMenu;
 
 /**
  * Route implementation to resolve HTTP requests.
@@ -265,7 +264,7 @@ class Route {
 				// only the controller was given and matches default, omit routing
 				$ignoreController = true;
 			}
-			else {
+			else if (!RequestHandler::getInstance()->isACPRequest()) {
 				$landingPage = PageMenu::getInstance()->getLandingPage();
 				if ($landingPage !== null && ($landingPage->getController() == $components['controller'])) {
 					$ignoreController = true;
-- 
2.20.1