Fixes Package search and adds language items

diff --git a/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php b/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
index c708c3b18e35dfe867376e890a11ac08befc2687..79b0b5cbbca7615b53a6bdbfb51a1ef00fe0727f 100644 (file)
--- a/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
@@ -29,7 +29,7 @@ class PackageACPSearchResultProvider implements IACPSearchResultProvider {
                // search by language item
                $conditions = new PreparedStatementConditionBuilder();
                $conditions->add("languageID = ?", array(WCF::getLanguage()->languageID));
-               $conditions->add("languageItem LIKE ?", array('wcf.acp.package.title.package%'));
+               $conditions->add("languageItem LIKE ?", array('wcf.acp.package.packageName.package%'));
                $conditions->add("languageItemValue LIKE ?", array($query.'%'));
                $conditions->add("packageID IN (?)", array(PackageDependencyHandler::getInstance()->getDependencies()));
                
@@ -41,7 +41,7 @@ class PackageACPSearchResultProvider implements IACPSearchResultProvider {
                
                $packageIDs = array();
                while ($row = $statement->fetchArray()) {
-                       $packageIDs[] = str_replace('wcf.acp.package.title.package', '', $row['languageItem']);
+                       $packageIDs[] = str_replace('wcf.acp.package.packageName.package', '', $row['languageItem']);
                }
                
                $conditions = new PreparedStatementConditionBuilder(false);
@@ -55,10 +55,10 @@ class PackageACPSearchResultProvider implements IACPSearchResultProvider {
                                OR package LIKE ?
                                ".(count($conditions->getParameters()) ? "OR ".$conditions : "");
                $statement = WCF::getDB()->prepareStatement($sql);
-               $statement->execute(array_merge($conditions->getParameters(), array(
+               $statement->execute(array_merge(array(
                        $query.'%',
                        $query.'%'
-               )));
+               ), $conditions->getParameters()));
                
                while ($package = $statement->fetchObject('wcf\data\package\Package')) {
                        $results[] = new ACPSearchResult($package->getName(), LinkHandler::getInstance()->getLink('PackageView', array(

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 958582ab0f87d9a56489c4b93891a9f7934c3747..1d22268a6669767487e68ab86221b4e9c680c1dc 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -340,6 +340,8 @@
        <category name="wcf.acp.search">
                <item name="wcf.acp.search.provider.com.woltlab.wcf.menuItem"><![CDATA[Seiten]]></item>
                <item name="wcf.acp.search.provider.com.woltlab.wcf.option"><![CDATA[Optionen]]></item>
+               <item name="wcf.acp.search.provider.com.woltlab.wcf.package"><![CDATA[Pakete]]></item>
+               <item name="wcf.acp.search.provider.com.woltlab.wcf.user"><![CDATA[Benutzer]]></item>
                <item name="wcf.acp.search.provider.com.woltlab.wcf.userGroupOption"><![CDATA[Berechtigungen]]></item>
        </category>
        

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index ab17f8a37b26b18addf7db0cdf3281d266ccf1da..edf482ed89b887eba56d49a9ea1642dd1f118253 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -340,6 +340,8 @@
        <category name="wcf.acp.search">
                <item name="wcf.acp.search.provider.com.woltlab.wcf.menuItem"><![CDATA[Pages]]></item>
                <item name="wcf.acp.search.provider.com.woltlab.wcf.option"><![CDATA[Options]]></item>
+               <item name="wcf.acp.search.provider.com.woltlab.wcf.package"><![CDATA[Packages]]></item>
+               <item name="wcf.acp.search.provider.com.woltlab.wcf.user"><![CDATA[Users]]></item>
                <item name="wcf.acp.search.provider.com.woltlab.wcf.userGroupOption"><![CDATA[Permissions]]></item>
        </category>