From 73e1a099a49524dbad0a904abd5da619ca0a1602 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joshua=20R=C3=BCsweg?= Date: Thu, 1 Feb 2018 12:39:07 +0100 Subject: [PATCH] Use forceFrontend parameter for frontend routes --- .../lib/system/request/route/DynamicRequestRoute.class.php | 2 +- .../files/lib/system/request/route/StaticRequestRoute.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php b/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php index 0727caceb4..0c62d96d2b 100644 --- a/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php +++ b/wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php @@ -284,6 +284,6 @@ class DynamicRequestRoute implements IRequestRoute { * @return string */ protected function getControllerName($application, $controller) { - return ControllerMap::getInstance()->lookup($application, $controller); + return ControllerMap::getInstance()->lookup($application, $controller, !$this->isACP()); } } diff --git a/wcfsetup/install/files/lib/system/request/route/StaticRequestRoute.class.php b/wcfsetup/install/files/lib/system/request/route/StaticRequestRoute.class.php index fddacb2397..8c8af2888e 100644 --- a/wcfsetup/install/files/lib/system/request/route/StaticRequestRoute.class.php +++ b/wcfsetup/install/files/lib/system/request/route/StaticRequestRoute.class.php @@ -94,7 +94,7 @@ class StaticRequestRoute extends DynamicRequestRoute { */ public function matches($requestURL) { if (parent::matches($requestURL)) { - $controller = ControllerMap::getInstance()->lookup($this->staticApplication, $this->staticController); + $controller = ControllerMap::getInstance()->lookup($this->staticApplication, $this->staticController, !$this->isACP()); if ($this->matchController && $this->routeData['controller'] !== $controller) { return false; } -- 2.20.1