From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 27 Apr 2016 08:51:36 +0000 (+0200)
Subject: Fixed an ACP issue
X-Git-Tag: 3.0.0_Beta_1~1809
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=092f84d8eb604de93db66d76f5b6ad8baa7040b3;p=GitHub%2FWoltLab%2FWCF.git

Fixed an ACP issue
---

diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
index 4afdeba382..8a3209a5b5 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\menu\item;
 use wcf\system\page\PageLocationManager;
+use wcf\system\request\RequestHandler;
 
 /**
  * Represents a menu item node tree.
@@ -63,16 +64,19 @@ class MenuItemNodeTree {
 		
 		// find possible active menu items
 		$activeMenuItems = [];
-		$possibleLocations = PageLocationManager::getInstance()->getLocations();
-		$length = count($possibleLocations);
-		foreach ($menuItemList as $menuItem) {
-			for ($i = 0; $i < $length; $i++) {
-				if ($menuItem->pageID == $possibleLocations[$i]['pageID'] && $menuItem->pageObjectID == $possibleLocations[$i]['pageObjectID']) {
-					if (!isset($activeMenuItems[$i])) {
-						$activeMenuItems[$i] = [];
+		
+		if (!RequestHandler::getInstance()->isACPRequest()) {
+			$possibleLocations = PageLocationManager::getInstance()->getLocations();
+			$length = count($possibleLocations);
+			foreach ($menuItemList as $menuItem) {
+				for ($i = 0; $i < $length; $i++) {
+					if ($menuItem->pageID == $possibleLocations[$i]['pageID'] && $menuItem->pageObjectID == $possibleLocations[$i]['pageObjectID']) {
+						if (!isset($activeMenuItems[$i])) {
+							$activeMenuItems[$i] = [];
+						}
+						
+						$activeMenuItems[$i][] = $menuItem->itemID;
 					}
-					
-					$activeMenuItems[$i][] = $menuItem->itemID;
 				}
 			}
 		}
diff --git a/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php b/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php
index 845a2c5b07..c2f27e6182 100644
--- a/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php
+++ b/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php
@@ -36,7 +36,6 @@ class PageLocationManager extends SingletonFactory {
 		}
 		
 		$metaData = $activeRequest->getMetaData();
-		$link = $title = '';
 		$page = null;
 		if (isset($metaData['cms'])) {
 			$pageID = $metaData['cms']['pageID'];