[6.0] Change menu type sorting to ordering (joomla#45769)

This reflects the change provided in joomla#38149

Author: HLeithner

administrator/components/com_menus/src/Helper/MenusHelper.php

@@ -108,7 +108,8 @@ public static function getMenuTypes($clientId = 0)
         $db    = Factory::getDbo();
         $query = $db->getQuery(true)
             ->select($db->quoteName('a.menutype'))
-            ->from($db->quoteName('#__menu_types', 'a'));
+            ->from($db->quoteName('#__menu_types', 'a'))
+            ->order($db->quoteName('ordering'));
 
         if (isset($clientId)) {
             $clientId = (int) $clientId;
@@ -223,7 +224,7 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
                 ->where($db->quoteName('menutype') . ' <> ' . $db->quote(''))
                 ->order(
                     [
-                        $db->quoteName('title'),
+                        $db->quoteName('ordering'),
                         $db->quoteName('menutype'),
                     ]
                 );

administrator/components/com_menus/src/Model/ItemsModel.php

@@ -416,7 +416,7 @@ protected function getListQuery()
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('client_id') . ' = :clientId')
                 ->bind(':clientId', $clientId, ParameterType::INTEGER)
-                ->order($db->quoteName('title'));
+                ->order($db->quoteName('ordering'));
 
             // Show protected items on explicit filter only
             $query->where($db->quoteName('a.menutype') . ' != ' . $db->quote('main'));

libraries/src/Form/Field/MenuField.php

@@ -59,7 +59,7 @@ protected function getGroups()
             ->order(
                 [
                     $db->quoteName('client_id'),
-                    $db->quoteName('title'),
+                    $db->quoteName('ordering'),
                 ]
             );
 

libraries/src/HTML/Helpers/Menu.php

@@ -70,7 +70,7 @@ public static function menus($clientId = 0)
                 ->order(
                     [
                         $db->quoteName('client_id'),
-                        $db->quoteName('title'),
+                        $db->quoteName('ordering'),
                     ]
                 );