diff --git a/wp-admin/custom-navigation.php b/wp-admin/custom-navigation.php
index f790abb8d8..a302fc6dbb 100644
--- a/wp-admin/custom-navigation.php
+++ b/wp-admin/custom-navigation.php
@@ -54,8 +54,9 @@ if ( isset( $_POST[ 'delete_menu' ] ) && $menu_selected_id > 0 ) {
$menu_selected_id = 0;
$updated = true;
}
+
// Default Menu to show
-$custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+$custom_menus = wp_get_nav_menus();
if ( ! $menu_selected_id && ! empty( $custom_menus ) )
$menu_selected_id = $custom_menus[0]->term_id;
@@ -174,18 +175,19 @@ if ( isset($_POST['reset_wp_menu']) && ! $updated ) {
diff --git a/wp-includes/custom-navigation.php b/wp-includes/custom-navigation.php
index 188c5b7473..21cf6e047d 100644
--- a/wp-includes/custom-navigation.php
+++ b/wp-includes/custom-navigation.php
@@ -46,7 +46,11 @@ function wp_create_nav_menu( $menu_name ) {
if ( $menu_exists )
return WP_Error('menu_exists', sprintf( __('A menu named "%s" already exists; please try another name.'), $menu_exists->name ));
- return wp_insert_term( $menu_name, 'nav_menu' );
+ $menu = wp_insert_term( $menu_name, 'nav_menu' );
+ if ( is_wp_error($menu) )
+ return $menu;
+
+ return get_term( $menu['term_id'], 'nav_menu');
}
function wp_get_nav_menu( $menu ) {