From ed332ce2bd0a6d8089386a56701f7b6bd89ef6df Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Wed, 24 Feb 2010 08:45:26 +0000
Subject: [PATCH] Fallback to wp_page_menu() from wp_nav_menu() if no menus are
 setup. Use wp_nav_menu() in twentyten. see #11817

git-svn-id: https://develop.svn.wordpress.org/trunk@13368 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/nav-menus.php                 |  2 +-
 wp-content/themes/twentyten/header.php |  2 +-
 wp-includes/default-widgets.php        |  2 +-
 wp-includes/nav-menu-template.php      | 30 ++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 3b7dd39fa3..b79f2feadc 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -30,7 +30,7 @@ require_once('admin-header.php');
 require_once(ABSPATH . 'wp-admin/includes/nav-menu.php');
 
 function wp_reset_nav_menu() {
-	wp_custom_navigation_setup(true);
+	wp_nav_menu_setup(true);
 
 	return true;
 }
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index ceafaad6b0..2bc9b2784f 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -50,7 +50,7 @@
 
 			<div id="access">
 				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
-				<?php wp_page_menu( 'sort_column=menu_order' ); ?>
+				<?php wp_nav_menu( 'sort_column=menu_order' ); ?>
 			</div><!-- #access -->
 
 		</div><!-- #masthead -->
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index a940ad7a01..2c1c71cd45 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -1126,7 +1126,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 						<?php
 							//DISPLAY custom navigation menu
 							if ( get_option('wp_custom_nav_menu') == 'true' )
-        						wp_nav_menu( array('id' => $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription) );
+        						wp_nav_menu( array('id' => $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription, 'format' => 'widget') );
 						?>
 
 				<?php
diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index ab894abcc8..5d144e6958 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -8,7 +8,37 @@
  * @param array $args Arguments
  */
 function wp_nav_menu( $args = array() ) {
+	$defaults = array('id' => '', 'slug' => '', 'menu_class' => 'menu', 'format' => 'div');
+	$args = wp_parse_args($args, $defaults);
+	$args = (object) $args;
+
+	$menu = null;
+	if ( !empty($args->id) ) {
+		$menu = wp_get_nav_menu( $args->id );
+	} elseif ( !empty($args->slug) ) {
+		$menu = get_term_by('slug', $args->slug, 'nav_menu');
+	} else {
+		$menus = wp_get_nav_menus();
+		foreach ( $menus as $menu_maybe ) {
+			if ( wp_get_nav_menu_items($menu_maybe->term_id) ) {
+				$menu = $menu_maybe;
+				break;
+			}
+		}
+	}
+
+	if ( !$menu || is_wp_error($menu) )
+		return wp_page_menu( $args );
+
+	if ( 'div' == $args->format )
+		echo '<div class="' . esc_attr($args->menu_class) . '"><ul>';
+
+	$args->id = $menu->term_id;
+
 	wp_print_nav_menu($args);
+		
+	if ( 'div' == $args->format )
+		echo '</ul></div>';
 }
 
 function wp_print_nav_menu( $args = array() ) {