Fixed routes not properly handling ACP requests

diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index 32839ea4f96d86d5498d6dc5ff334160472a6158..6c49d06fb66f4b4984d4c1c1903a76819f9c63b6 100644 (file)
--- 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 04bb8462b4c209e9e4e6f3d5e66c2105fd1ba486..91847511b561d16141fdf758c3132b723b509e52 100644 (file)
--- 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;