<!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>[15847] trunk/wp-includes/classes.php:
Fix current-cat & current-cat-parent classes for Category listings for non-category taxonomies
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15847">15847</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-19 10:10:11 +0000 (Tue, 19 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix current-cat & current-cat-parent classes for Category listings for non-category taxonomies. General cleanup of wp_list_categories() sanity checking. Props TheDeadMedic for the initial taxonomy patch. Fixes <a href="http://trac.wordpress.org/ticket/15143">#15143</a></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 (15846 => 15847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-10-19 08:16:10 UTC (rev 15846)
+++ trunk/wp-includes/classes.php 2010-10-19 10:10:11 UTC (rev 15847)
</span><span class="lines">@@ -1556,7 +1556,7 @@
</span><span class="cx"> $link .= '>';
</span><span class="cx"> $link .= $cat_name . '</a>';
</span><span class="cx">
</span><del>- if ( (! empty($feed_image)) || (! empty($feed)) ) {
</del><ins>+ if ( !empty($feed_image) || !empty($feed) ) {
</ins><span class="cx"> $link .= ' ';
</span><span class="cx">
</span><span class="cx"> if ( empty($feed_image) )
</span><span class="lines">@@ -1564,9 +1564,9 @@
</span><span class="cx">
</span><span class="cx"> $link .= '<a href="' . get_term_feed_link( $category->term_id, $category->taxonomy, $feed_type ) . '"';
</span><span class="cx">
</span><del>- if ( empty($feed) )
</del><ins>+ if ( empty($feed) ) {
</ins><span class="cx"> $alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
</span><del>- else {
</del><ins>+ } else {
</ins><span class="cx"> $title = ' title="' . $feed . '"';
</span><span class="cx"> $alt = ' alt="' . $feed . '"';
</span><span class="cx"> $name = $feed;
</span><span class="lines">@@ -1579,29 +1579,30 @@
</span><span class="cx"> $link .= $name;
</span><span class="cx"> else
</span><span class="cx"> $link .= "<img src='$feed_image'$alt$title" . ' />';
</span><ins>+
</ins><span class="cx"> $link .= '</a>';
</span><ins>+
</ins><span class="cx"> if ( empty($feed_image) )
</span><span class="cx"> $link .= ')';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($show_count) && $show_count )
</del><ins>+ if ( !empty($show_count) )
</ins><span class="cx"> $link .= ' (' . intval($category->count) . ')';
</span><span class="cx">
</span><del>- if ( isset($show_date) && $show_date ) {
</del><ins>+ if ( !empty($show_date) )
</ins><span class="cx"> $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
</span><del>- }
</del><span class="cx">
</span><del>- if ( isset($current_category) && $current_category )
- $_current_category = get_category( $current_category );
-
</del><span class="cx"> if ( 'list' == $args['style'] ) {
</span><span class="cx"> $output .= "\t<li";
</span><del>- $class = 'cat-item cat-item-'.$category->term_id;
- if ( isset($current_category) && $current_category && ($category->term_id == $current_category) )
- $class .= ' current-cat';
- elseif ( isset($_current_category) && $_current_category && ($category->term_id == $_current_category->parent) )
- $class .= ' current-cat-parent';
- $output .= ' class="'.$class.'"';
</del><ins>+ $class = 'cat-item cat-item-' . $category->term_id;
+ if ( !empty($current_category) ) {
+ $_current_category = get_term( $current_category, $category->taxonomy );
+ if ( $category->term_id == $current_category )
+ $class .= ' current-cat';
+ elseif ( $category->term_id == $_current_category->parent )
+ $class .= ' current-cat-parent';
+ }
+ $output .= ' class="' . $class . '"';
</ins><span class="cx"> $output .= ">$link\n";
</span><span class="cx"> } else {
</span><span class="cx"> $output .= "\t$link<br />\n";
</span></span></pre>
</div>
</div>
</body>
</html>