From f2d45573babffc2b149fdd9440733bb3e68d327c Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 5 Jun 2015 15:25:59 +0200 Subject: [PATCH] Fixed default controller incorrectly omitted if application matched --- .../files/lib/system/request/FlexibleRoute.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/system/request/FlexibleRoute.class.php b/wcfsetup/install/files/lib/system/request/FlexibleRoute.class.php index ceefd0e095..02766ad230 100644 --- a/wcfsetup/install/files/lib/system/request/FlexibleRoute.class.php +++ b/wcfsetup/install/files/lib/system/request/FlexibleRoute.class.php @@ -150,8 +150,10 @@ class FlexibleRoute implements IRoute { // check if this is the primary application and the landing page originates to the same application $primaryApplication = ApplicationHandler::getInstance()->getPrimaryApplication(); $abbreviation = ApplicationHandler::getInstance()->getAbbreviation($primaryApplication->packageID); - if ($abbreviation != $application || $landingPage === null) { - $ignoreController = true; + if ($abbreviation == $application) { + if ($landingPage === null || $landingPage->getController() === $components['controller']) { + $ignoreController = true; + } } } } -- 2.20.1