Merge branch '6.2' of https://github.com/WoltLab/WCF into 6.2

Author: dtdesign

wcfsetup/install/files/lib/system/gridView/AbstractGridView.class.php

@@ -56,7 +56,7 @@ abstract class AbstractGridView
     private int $rowsPerPage = 20;
     private string $baseUrl = '';
     private string $defaultSortField = '';
-    private string $defaultSortOrder = '';
+    private string $defaultSortOrder = 'ASC';
     private string $sortField = '';
     private string $sortOrder = 'ASC';
     private int $pageNo = 1;

wcfsetup/install/files/lib/system/listView/AbstractListView.class.php

@@ -36,7 +36,7 @@ abstract class AbstractListView
     private int $itemsPerPage = 20;
     private string $baseUrl = '';
     private string $defaultSortField = '';
-    private string $defaultSortOrder = '';
+    private string $defaultSortOrder = 'ASC';
     private string $sortField = '';
     private string $sortOrder = 'ASC';
     private string $cssClassName = '';

wcfsetup/install/files/lib/system/menu/acp/AcpMenuItem.class.php

@@ -22,16 +22,20 @@ public function __construct(
         public readonly string $parentMenuItem = '',
         public readonly string $link = '',
         public readonly ?FontAwesomeIcon $icon = null
-    ) {
-    }
+    ) {}
 
-    public function getLink()
+    #[\Override]
+    public function getLink(): string
     {
         return $this->link;
     }
 
-    public function getIcon(): ?FontAwesomeIcon
+    public function getIcon(): FontAwesomeIcon
     {
+        if ($this->icon === null) {
+            return FontAwesomeIcon::fromString('question;true');
+        }
+
         return $this->icon;
     }
 

wcfsetup/install/files/lib/system/search/acp/MenuItemACPSearchResultProvider.class.php

@@ -2,17 +2,16 @@
 
 namespace wcf\system\search\acp;
 
-use wcf\data\acp\menu\item\ACPMenuItem;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\menu\acp\ACPMenu;
+use wcf\system\menu\acp\AcpMenuItem;
 use wcf\system\WCF;
 
 /**
  * ACP search provider implementation for menu items.
  *
- * @author  Alexander Ebert
- * @copyright   2001-2019 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @author      Alexander Ebert
+ * @copyright   2001-2025 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 class MenuItemACPSearchResultProvider extends AbstractACPSearchResultProvider implements IACPSearchResultProvider
 {
@@ -22,52 +21,15 @@ class MenuItemACPSearchResultProvider extends AbstractACPSearchResultProvider im
     public function search($query)
     {
         $results = [];
+        $menuItems = ACPMenu::getInstance()->menuItemList;
 
-        // search by language item
-        $conditions = new PreparedStatementConditionBuilder();
-        $conditions->add("languageID = ?", [WCF::getLanguage()->languageID]);
+        foreach ($menuItems as $menuItem) {
+            \assert($menuItem instanceof AcpMenuItem);
 
-        // filter by language item
-        $languageItemsConditions = '';
-        $languageItemsParameters = [];
-        foreach (ACPSearchHandler::getInstance()->getAbbreviations('.acp.menu.link.%') as $abbreviation) {
-            if (!empty($languageItemsConditions)) {
-                $languageItemsConditions .= " OR ";
+            if (\mb_stripos($menuItem->__toString(), $query) === false) {
+                continue;
             }
-            $languageItemsConditions .= "languageItem LIKE ?";
-            $languageItemsParameters[] = $abbreviation;
-        }
-        $conditions->add("(" . $languageItemsConditions . ")", $languageItemsParameters);
-        $conditions->add("languageItemValue LIKE ?", ['%' . $query . '%']);
-
-        $sql = "SELECT      languageItem, languageItemValue
-                FROM        wcf1_language_item
-                " . $conditions . "
-                ORDER BY    languageItemValue ASC";
-        $statement = WCF::getDB()->prepare($sql); // don't use a limit here
-        $statement->execute($conditions->getParameters());
-        $languageItems = $statement->fetchMap('languageItem', 'languageItemValue');
-
-        if (empty($languageItems)) {
-            return [];
-        }
-
-        $conditions = new PreparedStatementConditionBuilder();
-        $conditions->add("menuItem IN (?)", [\array_keys($languageItems)]);
-        $conditions->add("menuItemController <> ''");
-
-        $sql = "SELECT  *
-                FROM    wcf1_acp_menu_item
-                " . $conditions;
-        $statement = WCF::getDB()->prepare($sql); // don't use a limit here
-        $statement->execute($conditions->getParameters());
-
-        $menuItems = ACPMenu::getInstance()->menuItemList;
-
-        while ($menuItem = $statement->fetchObject(ACPMenuItem::class)) {
-            // only valid menu items exist in TreeMenu::$menuItemList,
-            // so no need to call AbstractACPSearchResultProvider::validate()
-            if (!isset($menuItems[$menuItem->menuItem])) {
+            if (!$menuItem->getLink()) {
                 continue;
             }
 
@@ -79,7 +41,7 @@ public function search($query)
                 $parentMenuItem = $menuItems[$parentMenuItem]->parentMenuItem;
             }
             $results[] = new ACPSearchResult(
-                $languageItems[$menuItem->menuItem],
+                $menuItem->__toString(),
                 $menuItem->getLink(),
                 WCF::getLanguage()->getDynamicVariable(
                     'wcf.acp.search.result.subtitle',