Fixed menu item search

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 398bf21750bfc118b9d25771bee91a2f2cfe44aa..09dad4fbc5c1d1c1a10582db749a317aa0a51f31 100644 (file)
--- 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 9496bbaa3073454b612a46b158b2c0587e703e7e..aae1ad83b6896f6a04f540ec66b1022718bf2428 100644 (file)
--- 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