From ec6167d31fed779ad4fc84d4ab56ce3d4e369f98 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sat, 17 Feb 2018 14:19:05 +0100 Subject: [PATCH] Route cache did not distinguish between ACP and frontend destinations --- .../files/lib/system/request/ControllerMap.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php index 2ba8fa195a..b72ad31f94 100644 --- a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php +++ b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php @@ -160,16 +160,16 @@ class ControllerMap extends SingletonFactory { * @return string url representation of controller, e.g. 'members-list' */ public function lookup($application, $controller, $forceFrontend = null) { - $lookupKey = $application . '-' . $controller; + if ($forceFrontend === null) { + $forceFrontend = !class_exists(WCFACP::class, false); + } + + $lookupKey = ($forceFrontend ? '' : 'acp-') . $application . '-' . $controller; if (isset($this->lookupCache[$lookupKey])) { return $this->lookupCache[$lookupKey]; } - if ($forceFrontend === null) { - $forceFrontend = !class_exists(WCFACP::class, false); - } - if ($forceFrontend && isset($this->customUrls['reverse'][$application]) && isset($this->customUrls['reverse'][$application][$controller])) { $urlController = $this->customUrls['reverse'][$application][$controller]; } -- 2.20.1