<!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>[13975] trunk/wp-includes/classes.php: Ensure we'
re escaping css classes for front end nav menu.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13975">13975</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-03 23:04:37 +0000 (Sat, 03 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure we're escaping css classes for front end nav menu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (13974 => 13975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-04-03 22:52:30 UTC (rev 13974)
+++ trunk/wp-includes/classes.php 2010-04-03 23:04:37 UTC (rev 13975)
</span><span class="lines">@@ -1183,26 +1183,27 @@
</span><span class="cx"> function start_el(&$output, $item, $depth, $args) {
</span><span class="cx"> $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
</span><span class="cx">
</span><ins>+ $classes = $value = '';
</ins><span class="cx"> if ( 'frontend' == $args->context ) {
</span><span class="cx"> global $wp_query;
</span><span class="cx">
</span><del>- $css_class = array( 'menu-item', 'menu-item-type-'. $item->type, $item->classes );
</del><ins>+ $classes = array( 'menu-item', 'menu-item-type-'. $item->type, $item->classes );
</ins><span class="cx">
</span><span class="cx"> if ( 'custom' != $item->object )
</span><del>- $css_class[] = 'menu-item-object-'. $item->object;
</del><ins>+ $classes[] = 'menu-item-object-'. $item->object;
</ins><span class="cx">
</span><span class="cx"> if ( $item->object_id == $wp_query->get_queried_object_id() )
</span><del>- $css_class[] = 'current-menu-item';
</del><ins>+ $classes[] = 'current-menu-item';
</ins><span class="cx">
</span><span class="cx"> // @todo add classes for parent/child relationships
</span><span class="cx">
</span><del>- $css_class = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $css_class ), $item ) );
</del><ins>+ $classes = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item ) );
+ $classes = ' class="' . esc_attr( $classes ) . '"';
+ } else {
+ $value = ' value="' . $item->ID . '"';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $maybe_value = ( 'backend' == $args->context ) ? ' value="'. $item->ID .'"' : '';
- $maybe_classes = ( 'frontend' == $args->context ) ? ' class="'. $css_class .'"' : '';
-
- $output .= $indent . '<li id="menu-item-'. $item->ID .'"'. $maybe_value . $maybe_classes .'>' . wp_get_nav_menu_item( $item, $args->context, $args );
</del><ins>+ $output .= $indent . '<li id="menu-item-'. $item->ID . '"' . $value . $classes .'>' . wp_get_nav_menu_item( $item, $args->context, $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>