Ticket #29460: 29460.patch

src/wp-admin/nav-menus.php

@@ -380 +380 @@
 }
 
 // Get all nav menus.
-$nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
+$nav_menus = wp_get_nav_menus();
 $menu_count = count( $nav_menus );
 
 // Are we on the add new screen?

src/wp-includes/default-widgets.php

@@ -1344 +1344 @@
                 $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
 
                 // Get menus
-                $menus = wp_get_nav_menus( array( 'orderby' => 'name' ) );
+                $menus = wp_get_nav_menus();
 
                 // If no menus exists, direct the user to go and create some.
                 if ( !$menus ) {

src/wp-includes/nav-menu-template.php

@@ -277 +277 @@
 
         // get the first menu that has items if we still can't find a menu
         if ( ! $menu && !$args->theme_location ) {
-                $menus = wp_get_nav_menus( array( 'orderby' => 'name' ) );
+                $menus = wp_get_nav_menus();
                 foreach ( $menus as $menu_maybe ) {
                         if ( $menu_items = wp_get_nav_menu_items( $menu_maybe->term_id, array( 'update_post_term_cache' => false ) ) ) {
                                 $menu = $menu_maybe;

src/wp-includes/nav-menu.php

@@ -465 +465 @@
  * @return array menu objects
  */
 function wp_get_nav_menus( $args = array() ) {
-        $defaults = array( 'hide_empty' => false, 'orderby' => 'none' );
+        $defaults = array( 'hide_empty' => false, 'orderby' => 'name' );
         $args = wp_parse_args( $args, $defaults );
 
         /**

tests/phpunit/tests/post/nav-menu.php

@@ -116 +116 @@
                 $this->assertEquals( 'WordPress.org', $custom_item->title );
 
         }
+
+        /**
+         * @ticket 29460
+         */
+        function test_orderby_name_by_default() {
+                // We are going to create a random number of menus more (min 2, max 10) 
+                $menus_no = rand( 2, 10 );
+
+                for ( $i = 0; $i <= $menus_no; $i++ ) {
+                        wp_create_nav_menu( rand_str() );
+                }
+
+                // This is the expected array of menu names
+                $expected_nav_menus_names = wp_list_pluck( 
+                        get_terms( 'nav_menu',  array( 'hide_empty' => false, 'orderby' => 'name' ) ),
+                        'name'
+                );
+
+                // And this is what we got when calling wp_get_nav_menus()
+                $nav_menus_names = wp_list_pluck( wp_get_nav_menus(), 'name' );
+                
+                $this->assertEquals( $nav_menus_names, $expected_nav_menus_names );
+        }
 }
+        
+ No newline at end of file