Changeset 15847 for trunk/wp-includes/classes.php

Timestamp:

10/19/2010 10:10:11 AM (16 years ago)

Author:

dd32

Message:

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 #15143

File:

• trunk/wp-includes/classes.php (modified) (3 diffs)

trunk/wp-includes/classes.php

@@ -1557 +1557 @@
                 $link .= $cat_name . '</a>';
 
-                if ( (! empty($feed_image)) || (! empty($feed)) ) {
+                if ( !empty($feed_image) || !empty($feed) ) {
                         $link .= ' ';
 
@@ -1565 +1565 @@
                         $link .= '<a href="' . get_term_feed_link( $category->term_id, $category->taxonomy, $feed_type ) . '"';
 
-                        if ( empty($feed) )
+                        if ( empty($feed) ) {
                                 $alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
-                        else {
+                        } else {
                                 $title = ' title="' . $feed . '"';
                                 $alt = ' alt="' . $feed . '"';
@@ -1580 +1580 @@
                         else
                                 $link .= "<img src='$feed_image'$alt$title" . ' />';
+
                         $link .= '</a>';
+
                         if ( empty($feed_image) )
                                 $link .= ')';
                 }
 
-                if ( isset($show_count) && $show_count )
+                if ( !empty($show_count) )
                         $link .= ' (' . intval($category->count) . ')';
 
-                if ( isset($show_date) && $show_date ) {
+                if ( !empty($show_date) )
                         $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
-                }
-
-                if ( isset($current_category) && $current_category )
-                        $_current_category = get_category( $current_category );
 
                 if ( 'list' == $args['style'] ) {
                         $output .= "\t<li";
-                        $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.'"';
+                        $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 . '"';
                         $output .= ">$link\n";
                 } else {