Changeset 16519

Timestamp:

11/21/2010 01:32:02 PM (13 years ago)

Author:

nacin

Message:

Introduce items_wrap arg to wp_nav_menu(). props filosofo, fixes #14235.

File:

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

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

@@ -129 +129 @@
  * walker - allows a custom walker to be specified.
  * theme_location - the location in the theme to be used.  Must be registered with register_nav_menu() in order to be selectable by the user.
+ * items_wrap - How the list items should be wrapped. Defaults to a ul with an id and class. Uses printf() format with numbered placeholders.
  *
  * @since 3.0.0
@@ -138 +139 @@
 
     $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 'menu_id' => '',
-    'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '',
+    'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>',
     'depth' => 0, 'walker' => '', 'theme_location' => '' );
 
@@ -216 +217 @@
     }
     $menu_id_slugs[] = $slug;
-    $attributes = ' id="' . $slug . '"';
-    $attributes .= $args->menu_class ? ' class="'. $args->menu_class .'"' : '';
-
-    $nav_menu .= '<ul'. $attributes .'>';
+    
+    $wrap_class = $args->menu_class ? $args->menu_class : '';
 
     // Allow plugins to hook into the menu to add their own <li>'s
     $items = apply_filters( 'wp_nav_menu_items', $items, $args );
     $items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args );
-    $nav_menu .= $items;
+    
+    $nav_menu .= sprintf( $args->items_wrap, $slug, $wrap_class, $items );
     unset($items);
-
-    $nav_menu .= '</ul>';
 
     if ( $show_container )