Resolve the application override before generating the link

Fixes #2934

diff --git a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
index 539b7674981382a2782e4b924830d552ac575241..9cad72fb625e3157ce40e3d4f60c986afea29f5d 100644 (file)
--- 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;