X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..refs/tags/wordpress-3.1-scripts:/wp-includes/nav-menu-template.php

diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index d2fb493b..21898ab8 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -71,11 +71,15 @@ class Walker_Nav_Menu extends Walker {
 		$class_names = $value = '';
 
 		$classes = empty( $item->classes ) ? array() : (array) $item->classes;
+		$classes[] = 'menu-item-' . $item->ID;
 
-		$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) );
+		$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args ) );
 		$class_names = ' class="' . esc_attr( $class_names ) . '"';
 
-		$output .= $indent . '<li id="menu-item-'. $item->ID . '"' . $value . $class_names .'>';
+		$id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args );
+		$id = strlen( $id ) ? ' id="' . esc_attr( $id ) . '"' : '';
+
+		$output .= $indent . '<li' . $id . $value . $class_names .'>';
 
 		$attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : '';
 		$attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : '';
@@ -115,7 +119,7 @@ class Walker_Nav_Menu extends Walker {
  * container - Whether to wrap the ul, and what to wrap it with. Defaults to 'div'.
  * container_class - the class that is applied to the container. Defaults to 'menu-{menu slug}-container'.
  * container_id - The ID that is applied to the container. Defaults to blank.
- * fallback_cb - If the menu doesn't exists, a callback function will fire. Defaults to 'wp_page_menu'.
+ * fallback_cb - If the menu doesn't exists, a callback function will fire. Defaults to 'wp_page_menu'. Set to false for no fallback.
  * before - Text before the link text.
  * after - Text after the link text.
  * link_before - Text before the link.
@@ -124,6 +128,7 @@ class Walker_Nav_Menu extends Walker {
  * depth - how many levels of the hierarchy are to be included.  0 means all.  Defaults to 0.
  * 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
  *
@@ -133,7 +138,7 @@ function wp_nav_menu( $args = array() ) {
 	static $menu_id_slugs = array();
 
 	$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' => '' );
 
 	$args = wp_parse_args( $args, $defaults );
@@ -164,7 +169,7 @@ function wp_nav_menu( $args = array() ) {
 
 	// If no menu was found or if the menu has no items and no location was requested, call the fallback_cb if it exists
 	if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
-		&& ( function_exists($args->fallback_cb) || is_callable( $args->fallback_cb ) ) )
+		&& $args->fallback_cb && is_callable( $args->fallback_cb ) )
 			return call_user_func( $args->fallback_cb, (array) $args );
 
 	// If no fallback function was specified and the menu doesn't exists, bail.
@@ -193,34 +198,33 @@ function wp_nav_menu( $args = array() ) {
 
 	unset($menu_items);
 
+	$sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args );
+
 	$items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args );
 	unset($sorted_menu_items);
 
 	// Attributes
 	if ( ! empty( $args->menu_id ) ) {
-		$slug = $args->menu_id;
+		$wrap_id = $args->menu_id;
 	} else {
-		$slug = 'menu-' . $menu->slug;
-		while ( in_array( $slug, $menu_id_slugs ) ) {
-			if ( preg_match( '#-(\d+)$#', $slug, $matches ) )
-				$slug = preg_replace('#-(\d+)$#', '-' . ++$matches[1], $slug);
+		$wrap_id = 'menu-' . $menu->slug;
+		while ( in_array( $wrap_id, $menu_id_slugs ) ) {
+			if ( preg_match( '#-(\d+)$#', $wrap_id, $matches ) )
+				$wrap_id = preg_replace('#-(\d+)$#', '-' . ++$matches[1], $wrap_id );
 			else
-				$slug = $slug . '-1';
+				$wrap_id = $wrap_id . '-1';
 		}
 	}
-	$menu_id_slugs[] = $slug;
-	$attributes = ' id="' . $slug . '"';
-	$attributes .= $args->menu_class ? ' class="'. $args->menu_class .'"' : '';
+	$menu_id_slugs[] = $wrap_id;
 
-	$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;
-	unset($items);
 
-	$nav_menu .= '</ul>';
+	$nav_menu .= sprintf( $args->items_wrap, esc_attr( $wrap_id ), esc_attr( $wrap_class ), $items );
+	unset( $items );
 
 	if ( $show_container )
 		$nav_menu .= '</' . $args->container . '>';
@@ -307,10 +311,16 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 
 	$possible_object_parents = array_filter( $possible_object_parents );
 
+	$front_page_url = home_url();
+
 	foreach ( (array) $menu_items as $key => $menu_item ) {
+
+		$menu_items[$key]->current = false;
+
 		$classes = (array) $menu_item->classes;
 		$classes[] = 'menu-item';
 		$classes[] = 'menu-item-type-' . $menu_item->type;
+		$classes[] = 'menu-item-object-' . $menu_item->object;
 
 		// if the menu item corresponds to a taxonomy term for the currently-queried non-hierarchical post object
 		if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type && in_array( $menu_item->object_id, $possible_object_parents ) ) {
@@ -328,6 +338,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			)
 		) {
 			$classes[] = 'current-menu-item';
+			$menu_items[$key]->current = true;
 			$_anc_id = (int) $menu_item->db_id;
 
 			while(
@@ -349,10 +360,13 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 
 		// if the menu item corresponds to the currently-requested URL
 		} elseif ( 'custom' == $menu_item->object ) {
-			$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-			$item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
-			if ( $item_url == $current_url ) {
+			$current_url = untrailingslashit( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+			$item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
+			$_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
+
+			if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
 				$classes[] = 'current-menu-item';
+				$menu_items[$key]->current = true;
 				$_anc_id = (int) $menu_item->db_id;
 
 				while(
@@ -362,15 +376,21 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 					$active_ancestor_item_ids[] = $_anc_id;
 				}
 
-				if ( untrailingslashit($current_url) == home_url() ) {
-					$classes[] = 'menu-item-home';
-					// Back compat for home limk to match wp_page_menu()
+				if ( in_array( home_url(), array( untrailingslashit( $current_url ), untrailingslashit( $_indexless_current ) ) ) ) {
+					// Back compat for home link to match wp_page_menu()
 					$classes[] = 'current_page_item';
 				}
 				$active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
 				$active_parent_object_ids[] = (int) $menu_item->post_parent;
 				$active_object = $menu_item->object;
+
+			// give front page item current-menu-item class when extra query arguments involved
+			} elseif ( $item_url == $front_page_url && is_front_page() ) {
+				$classes[] = 'current-menu-item';
 			}
+
+			if ( untrailingslashit($item_url) == home_url() )
+				$classes[] = 'menu-item-home';
 		}
 
 		// back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
@@ -386,6 +406,8 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 	// set parent's class
 	foreach ( (array) $menu_items as $key => $parent_item ) {
 		$classes = (array) $parent_item->classes;
+		$menu_items[$key]->current_item_ancestor = false;
+		$menu_items[$key]->current_item_parent = false;
 
 		if (
 			isset( $parent_item->type ) &&
@@ -395,14 +417,19 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 					'post_type' == $parent_item->type &&
 					! empty( $queried_object->post_type ) &&
 					is_post_type_hierarchical( $queried_object->post_type ) &&
-					in_array( $parent_item->object_id, $queried_object->ancestors )
+					in_array( $parent_item->object_id, $queried_object->ancestors ) &&
+					$parent_item->object != $queried_object->ID
 				) ||
 
 				// ancestral term
 				(
 					'taxonomy' == $parent_item->type &&
 					isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
-					in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
+					in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
+					(
+						! isset( $queried_object->term_id ) ||
+						$parent_item->object_id != $queried_object->term_id
+					)
 				)
 			)
 		) {
@@ -411,9 +438,12 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 
 		if ( in_array(  intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
 			$classes[] = 'current-menu-ancestor';
+			$menu_items[$key]->current_item_ancestor = true;
 		}
-		if ( in_array( $parent_item->db_id, $active_parent_item_ids ) )
+		if ( in_array( $parent_item->db_id, $active_parent_item_ids ) ) {
 			$classes[] = 'current-menu-parent';
+			$menu_items[$key]->current_item_parent = true;
+		}
 		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
 			$classes[] = 'current-' . $active_object . '-parent';
 
@@ -433,7 +463,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
  * Retrieve the HTML list content for nav menu items.
  *
  * @uses Walker_Nav_Menu to create HTML list content.
- * @since 2.1.0
+ * @since 3.0.0
  * @see Walker::walk() for parameters and return description.
  */
 function walk_nav_menu_tree( $items, $depth, $r ) {
@@ -443,4 +473,17 @@ function walk_nav_menu_tree( $items, $depth, $r ) {
 	return call_user_func_array( array(&$walker, 'walk'), $args );
 }
 
-?>
+/**
+ * Prevents a menu item ID from being used more than once.
+ *
+ * @since 3.0.1
+ * @access private
+ */
+function _nav_menu_item_id_use_once( $id, $item ) {
+	static $_used_ids = array();
+	if ( in_array( $item->ID, $_used_ids ) )
+		return '';
+	$_used_ids[] = $item->ID;
+	return $id;
+}
+add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );