From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 15 Nov 2019 00:01:28 +0000 (+0100)
Subject: Workaround for landing pages from different app namespaces
X-Git-Tag: 5.2.0_Beta_3~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d59dba909103b373ed24615b3426f946cd9dbaf9;p=GitHub%2FWoltLab%2FWCF.git

Workaround for landing pages from different app namespaces
---

diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index 5fbac25b77..04dab82b68 100644
--- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
@@ -172,7 +172,12 @@ class RequestHandler extends SingletonFactory {
 					exit;
 				}
 				
-				$classData = ControllerMap::getInstance()->resolve($application, $controller, $this->isACPRequest(), RouteHandler::getInstance()->isRenamedController());
+				$classApplication = $application;
+				if (!empty($routeData['isDefaultController']) && !empty($routeData['application']) && $routeData['application'] !== $application) {
+					$classApplication = $routeData['application'];
+				}
+				
+				$classData = ControllerMap::getInstance()->resolve($classApplication, $controller, $this->isACPRequest(), RouteHandler::getInstance()->isRenamedController());
 				if (is_string($classData)) {
 					$this->redirect($routeData, $application, $classData);
 				}