From f1f5f4f8f77d887af76ecaeca3f4262a32a5031f Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 19 May 2010 18:52:37 +0000
Subject: [PATCH] Order menu tabs by name. Allow passing args to
 wp_get_nav_menus() which are passed on to get_terms(). Default orderby for
 wo_get_nav_menus() to none since most requests won't care about order. fixes
 #13334

git-svn-id: http://svn.automattic.com/wordpress/trunk@14751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/nav-menus.php   | 2 +-
 wp-includes/nav-menu.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index cb8a6ab36..8343d2f1a 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -345,7 +345,7 @@ switch ( $action ) {
 }
 
 // Get all nav menus
-$nav_menus = wp_get_nav_menus();
+$nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
 
 // Get recently edited nav menu
 $recently_edited = (int) get_user_option( 'nav_menu_recently_edited' );
diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 58103f31e..4ab15c6f8 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -394,10 +394,13 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
  *
  * @since 3.0.0
  *
+ * @param $args array Array of arguments passed on to get_terms().
  * @return array menu objects
  */
-function wp_get_nav_menus() {
-	return get_terms( 'nav_menu', array( 'hide_empty' => false, 'orderby' => 'id' ) );
+function wp_get_nav_menus( $args = array() ) {
+	$defaults = array( 'hide_empty' => false, 'orderby' => 'none' );
+	$args = wp_parse_args( $args, $defaults );
+	return get_terms( 'nav_menu',  $args);
 }