From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 27 Aug 2016 18:36:28 +0000 (+0200)
Subject: Custom urls no longer affect acp links
X-Git-Tag: 3.0.0_Beta_1~450
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ed73f35d59965d2aadd59844a93c5786dafee592;p=GitHub%2FWoltLab%2FWCF.git

Custom urls no longer affect acp links
---

diff --git a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
index 3dbf6e096f..214b66aa8b 100644
--- a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
+++ b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
@@ -5,6 +5,7 @@ use wcf\system\cache\builder\RoutingCacheBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
+use wcf\system\WCFACP;
 
 /**
  * Resolves incoming requests and performs lookups for controller to url mappings.
@@ -81,7 +82,7 @@ class ControllerMap extends SingletonFactory {
 		if ($classData === null) {
 			throw new SystemException("Unknown controller '" . $controller . "'");
 		}
-		else {
+		else if (!$isAcpRequest) {
 			// handle controllers with a custom url
 			$controller = $classData['controller'];
 			
@@ -152,7 +153,7 @@ class ControllerMap extends SingletonFactory {
 			return $this->lookupCache[$lookupKey];
 		}
 		
-		if (isset($this->customUrls['reverse'][$application]) && isset($this->customUrls['reverse'][$application][$controller])) {
+		if (!class_exists(WCFACP::class, false) && isset($this->customUrls['reverse'][$application]) && isset($this->customUrls['reverse'][$application][$controller])) {
 			$urlController = $this->customUrls['reverse'][$application][$controller];
 		}
 		else {