Changeset 14620 for trunk/wp-includes/nav-menu-template.php

Timestamp:

05/14/2010 06:20:30 AM (14 years ago)

Author:

nacin

Message:

First pass on 'Theme Locations' for navigation menus. Themes need to specify a location when calling wp_nav_menu and register locations in functions.php. Users then map menus to locations in the nav menu admin. Subject to review. see #13378.

File:

• trunk/wp-includes/nav-menu-template.php (modified) (2 diffs)

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

@@ -194 +194 @@
     $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true,
     'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '',
-    'depth' => 0, 'walker' => '', 'context' => 'frontend', 'theme_menu' => '' );
+    'depth' => 0, 'walker' => '', 'context' => 'frontend', 'theme_location' => '' );
 
     $args = wp_parse_args( $args, $defaults );
@@ -200 +200 @@
     $args = (object) $args;
 
-    // Get the nav menu
+    // Get the nav menu based on the requested menu
     $menu = wp_get_nav_menu_object( $args->menu );
 
-    if ( ! $menu && $slot ) {
-        $slots = get_nav_menu_slots();
-        if ( isset($slots) && isset($slots['theme_menu']) )
-            $menu = wp_get_nav_menu_object( $slots['theme_menu'] );
-    }
-
-    // If we couldn't find a menu based off the menu argument 
-    // get the first menu that has items.
+    // Get the nav menu based on the theme_location
+    if ( ! $menu && $args->theme_location && ( $locations = get_nav_menu_locations() ) && isset( $locations[ $args->theme_location ] ) )
+        $menu = wp_get_nav_menu_object( $locations[ $args->theme_location ] );
+
+    // get the first menu that has items if we still can't find a menu
     if ( ! $menu ) {
         $menus = wp_get_nav_menus();