Ticket #29460: 29460.revised.diff

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?

wp-includes/nav-menu.php

@@ -466 +466 @@
  * @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 );
 
         /**

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 ) {

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;