<!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>[16520] trunk/wp-includes/nav-menu-template.php:
Escape the wrap ID and class attributes going into sprintf() and s/slug/
wrap_id/ to make it more obvious.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16520">16520</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-21 13:37:09 +0000 (Sun, 21 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Escape the wrap ID and class attributes going into sprintf() and s/slug/wrap_id/ to make it more obvious. see <a href="http://trac.wordpress.org/ticket/14235">#14235</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (16519 => 16520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-11-21 13:32:02 UTC (rev 16519)
+++ trunk/wp-includes/nav-menu-template.php 2010-11-21 13:37:09 UTC (rev 16520)
</span><span class="lines">@@ -205,27 +205,27 @@
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx"> if ( ! empty( $args->menu_id ) ) {
</span><del>- $slug = $args->menu_id;
</del><ins>+ $wrap_id = $args->menu_id;
</ins><span class="cx"> } else {
</span><del>- $slug = 'menu-' . $menu->slug;
- while ( in_array( $slug, $menu_id_slugs ) ) {
- if ( preg_match( '#-(\d+)$#', $slug, $matches ) )
- $slug = preg_replace('#-(\d+)$#', '-' . ++$matches[1], $slug);
</del><ins>+ $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 );
</ins><span class="cx"> else
</span><del>- $slug = $slug . '-1';
</del><ins>+ $wrap_id = $wrap_id . '-1';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- $menu_id_slugs[] = $slug;
-
</del><ins>+ $menu_id_slugs[] = $wrap_id;
+
</ins><span class="cx"> $wrap_class = $args->menu_class ? $args->menu_class : '';
</span><span class="cx">
</span><span class="cx"> // Allow plugins to hook into the menu to add their own <li>'s
</span><span class="cx"> $items = apply_filters( 'wp_nav_menu_items', $items, $args );
</span><span class="cx"> $items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args );
</span><del>-
- $nav_menu .= sprintf( $args->items_wrap, $slug, $wrap_class, $items );
- unset($items);
</del><span class="cx">
</span><ins>+ $nav_menu .= sprintf( $args->items_wrap, esc_attr( $wrap_id ), esc_attr( $wrap_class ), $items );
+ unset( $items );
+
</ins><span class="cx"> if ( $show_container )
</span><span class="cx"> $nav_menu .= '</' . $args->container . '>';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>