From ea335089f5819c5710208e32753f01a37bc874c6 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Thu, 20 Jun 2019 16:14:13 +0200 Subject: [PATCH] Resolve the application override before generating the link Fixes #2934 --- .../install/files/lib/system/request/LinkHandler.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php index 539b767498..9cad72fb62 100644 --- a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php @@ -211,6 +211,7 @@ class LinkHandler extends SingletonFactory { } $parameters['controller'] = $controller; + $abbreviation = ControllerMap::getInstance()->getApplicationOverride($abbreviation, $controller); $routeURL = RouteHandler::getInstance()->buildRoute($abbreviation, $parameters, $isACP); if (!$isRaw && !empty($url)) { $routeURL .= (strpos($routeURL, '?') === false) ? '?' : '&'; @@ -223,8 +224,6 @@ class LinkHandler extends SingletonFactory { $url = $routeURL . $url; - $abbreviation = ControllerMap::getInstance()->getApplicationOverride($abbreviation, $controller); - // handle applications if (!PACKAGE_ID) { $url = RouteHandler::getHost() . RouteHandler::getPath(['acp']) . ($isACP ? 'acp/' : '') . $url; -- 2.20.1