Fixed default controller incorrectly omitted if application matched
authorAlexander Ebert <ebert@woltlab.com>
Fri, 5 Jun 2015 13:25:59 +0000 (15:25 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 5 Jun 2015 13:25:59 +0000 (15:25 +0200)
wcfsetup/install/files/lib/system/request/FlexibleRoute.class.php

index ceefd0e095a1189459432916f1b6028966abff93..02766ad230d60801535623bd6e542ca546700183 100644 (file)
@@ -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;
+                                                       }
                                                }
                                        }
                                }