From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 7 May 2013 15:32:29 +0000 (+0200)
Subject: Fixed menu item search
X-Git-Tag: 2.0.0_Beta_1~232^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c9de8fabacb943b9d736c73a8b0ac34dcda0fd82;p=GitHub%2FWoltLab%2FWCF.git

Fixed menu item search
---

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 398bf21750..09dad4fbc5 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -50,7 +50,6 @@
 		
 		<acpmenuitem name="wcf.acp.menu.link.package.install">
 			<controller><![CDATA[wcf\acp\form\PackageStartInstallForm]]></controller>
-			<link><![CDATA[action=install]]></link>
 			<parent>wcf.acp.menu.link.package.management</parent>
 			<permissions>admin.system.package.canInstallPackage</permissions>
 			<showorder>2</showorder>
diff --git a/wcfsetup/install/files/lib/system/search/acp/MenuItemACPSearchResultProvider.class.php b/wcfsetup/install/files/lib/system/search/acp/MenuItemACPSearchResultProvider.class.php
index 9496bbaa30..aae1ad83b6 100644
--- a/wcfsetup/install/files/lib/system/search/acp/MenuItemACPSearchResultProvider.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/MenuItemACPSearchResultProvider.class.php
@@ -52,9 +52,9 @@ class MenuItemACPSearchResultProvider extends AbstractACPSearchResultProvider im
 		
 		$conditions = new PreparedStatementConditionBuilder();
 		$conditions->add("menuItem IN (?)", array(array_keys($languageItems)));
-		$conditions->add("menuItemLink <> ''");
+		$conditions->add("menuItemController <> ''");
 		
-		$sql = "SELECT	menuItem, menuItemLink, permissions, options
+		$sql = "SELECT	*
 			FROM	wcf".WCF_N."_acp_menu_item
 			".$conditions;
 		$statement = WCF::getDB()->prepareStatement($sql); // don't use a limit here