From: Alexander Ebert Date: Fri, 5 Jun 2015 13:25:59 +0000 (+0200) Subject: Fixed default controller incorrectly omitted if application matched X-Git-Tag: 2.1.5~27 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f2d45573babffc2b149fdd9440733bb3e68d327c;p=GitHub%2FWoltLab%2FWCF.git Fixed default controller incorrectly omitted if application matched --- 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; + } } } }