Changeset 13368

Timestamp:

02/24/2010 08:45:26 AM (16 years ago)

Author:

ryan

Message:

Fallback to wp_page_menu() from wp_nav_menu() if no menus are setup. Use wp_nav_menu() in twentyten. see #11817

Location:

trunk

Files:

• wp-admin/nav-menus.php (modified) (1 diff)
• wp-content/themes/twentyten/header.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/nav-menu-template.php (modified) (1 diff)

trunk/wp-admin/nav-menus.php

@@ -31 +31 @@
 
 function wp_reset_nav_menu() {
-    wp_custom_navigation_setup(true);
+    wp_nav_menu_setup(true);
 
     return true;

trunk/wp-content/themes/twentyten/header.php

@@ -51 +51 @@
             <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 -->
 

trunk/wp-includes/default-widgets.php

@@ -1127 +1127 @@
                             //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') );
                         ?>
 

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

@@ -9 +9 @@
  */
 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>';
 }