<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15408] branches/3.0/wp-includes/nav-menu-template.php:
Prevent the same menu item from receiving duplicate IDs if the menu is used twice
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15408">15408</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-07-13 21:31:20 +0000 (Tue, 13 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent the same menu item from receiving duplicate IDs if the menu is used twice. All menu items now get a class with their post ID; only the first item now gets an ID. fixes <a href="http://trac.wordpress.org/ticket/13976">#13976</a> for 3.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpincludesnavmenutemplatephp">branches/3.0/wp-includes/nav-menu-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-includes/nav-menu-template.php (15407 => 15408)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-includes/nav-menu-template.php 2010-07-13 21:30:59 UTC (rev 15407)
+++ branches/3.0/wp-includes/nav-menu-template.php 2010-07-13 21:31:20 UTC (rev 15408)
</span><span class="lines">@@ -71,12 +71,16 @@
</span><span class="cx"> $class_names = $value = '';
</span><span class="cx">
</span><span class="cx"> $classes = empty( $item->classes ) ? array() : (array) $item->classes;
</span><ins>+ $classes[] = 'menu-item-' . $item->ID;
</ins><span class="cx">
</span><span class="cx"> $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) );
</span><span class="cx"> $class_names = ' class="' . esc_attr( $class_names ) . '"';
</span><span class="cx">
</span><del>- $output .= $indent . '<li id="menu-item-'. $item->ID . '"' . $value . $class_names .'>';
</del><ins>+ $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args );
+ $id = strlen( $id ) ? ' id="' . esc_attr( $id ) . '"' : '';
</ins><span class="cx">
</span><ins>+ $output .= $indent . '<li' . $id . $value . $class_names .'>';
+
</ins><span class="cx"> $attributes = ! empty( $item->attr_title ) ? ' title="' . esc_attr( $item->attr_title ) .'"' : '';
</span><span class="cx"> $attributes .= ! empty( $item->target ) ? ' target="' . esc_attr( $item->target ) .'"' : '';
</span><span class="cx"> $attributes .= ! empty( $item->xfn ) ? ' rel="' . esc_attr( $item->xfn ) .'"' : '';
</span><span class="lines">@@ -437,7 +441,7 @@
</span><span class="cx"> * Retrieve the HTML list content for nav menu items.
</span><span class="cx"> *
</span><span class="cx"> * @uses Walker_Nav_Menu to create HTML list content.
</span><del>- * @since 2.1.0
</del><ins>+ * @since 3.0.0
</ins><span class="cx"> * @see Walker::walk() for parameters and return description.
</span><span class="cx"> */
</span><span class="cx"> function walk_nav_menu_tree( $items, $depth, $r ) {
</span><span class="lines">@@ -447,4 +451,19 @@
</span><span class="cx"> return call_user_func_array( array(&$walker, 'walk'), $args );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * 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 );
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>