Ticket #3567: 3567.category-template.php.diff

Index: wp-includes/classes.php
===================================================================
--- wp-includes/classes.php     (revision 5143)
+++ wp-includes/classes.php     (working copy)
@@ -560,96 +560,97 @@
        var $db_fields = array ('parent' => 'category_parent', 'id' => 'cat_ID'); //TODO: decouple this
 
        function start_lvl($output, $depth, $args) {
-               if ( 'list' != $args['style'] )
-                       return $output;
-
-               $indent = str_repeat("\t", $depth);
-               $output .= "$indent<ul class='children'>\n";
+               $output .= str_repeat("\t", $depth);
+               
+               switch ($args['format']) {
+                       case 'html':
+                               $output .= '<ul>';
+                               break;
+               }
+               
+               $output .= "\n";
+               
                return $output;
        }
 
        function end_lvl($output, $depth, $args) {
-               if ( 'list' != $args['style'] )
-                       return $output;
-
-               $indent = str_repeat("\t", $depth);
-               $output .= "$indent</ul>\n";
+               $output .= str_repeat("\t", $depth);
+               
+               switch ($args['format']) {
+                       case 'html':
+                               $output .= '</ul>';
+                               break;
+               }
+               
+               $output .= "\n";
+               
                return $output;
        }
 
        function start_el($output, $category, $depth, $args) {
                extract($args);
-
-               $cat_name = attribute_escape( $category->cat_name);
-               $cat_name = apply_filters( 'list_cats', $cat_name, $category );
-               $link = '<a href="' . get_category_link( $category->cat_ID ) . '" ';
-               if ( $use_desc_for_title == 0 || empty($category->category_description) )
-                       $link .= 'title="' . sprintf(__( 'View all posts filed under %s' ), $cat_name) . '"';
-               else
-                       $link .= 'title="' . attribute_escape( apply_filters( 'category_description', $category->category_description, $category )) . '"';
-               $link .= '>';
-               $link .= $cat_name . '</a>';
-
-               if ( (! empty($feed_image)) || (! empty($feed)) ) {
-                       $link .= ' ';
-
-                       if ( empty($feed_image) )
-                               $link .= '(';
-
-                       $link .= '<a href="' . get_category_rss_link( 0, $category->cat_ID, $category->category_nicename ) . '"';
-
-                       if ( empty($feed) )
-                               $alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
-                       else {
-                               $title = ' title="' . $feed . '"';
-                               $alt = ' alt="' . $feed . '"';
-                               $name = $feed;
-                               $link .= $title;
+               
+               $output .= str_repeat("\t", $depth + 1);
+               
+               if ($current_category) {
+                       $_current_category = get_category($current_category);
+                       
+                       if ($_current_category->cat_ID == $category->cat_ID) {
+                               $current_class = ' class="current-cat"';
+                       } elseif ($_current_category->category_parent == $category->cat_ID) {
+                               $current_class = ' class="current-cat-parent"';
                        }
-
-                       $link .= '>';
-
-                       if ( empty($feed_image) )
-                               $link .= $name;
-                       else
-                               $link .= "<img src='$feed_image'$alt$title" . ' />';
-                       $link .= '</a>';
-                       if ( empty($feed_image) )
-                               $link .= ')';
+               
+               switch ($format) {
+                       case 'html':
+                               $output .= "<li$current_class>";
+                               break;
                }
-
-               if ( isset($show_count) && $show_count )
-                       $link .= ' (' . intval($category->category_count) . ')';
-
-               if ( isset($show_date) && $show_date ) {
-                       $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
-               }
-
-               if ( $current_category )
-                       $_current_category = get_category( $current_category );
-
-               if ( 'list' == $args['style'] ) {
-                       $output .= "\t<li";
-                       if ( $current_category && ($category->cat_ID == $current_category) )
-                               $output .=  ' class="current-cat"';
-                       elseif ( $_current_category && ($category->cat_ID == $_current_category->category_parent) )
-                               $output .=  ' class="current-cat-parent"';
-                       $output .= ">$link\n";
+               
+               $output .= $before;
+               
+               $output .= '<a href="' . get_category_link($category->cat_ID) . '" ';
+               
+               $cat_name = apply_filters('list_cats', $category->cat_name, $category);
+               
+               if (!$use_desc_for_title || empty($category->category_description)) {
+                       $output .= 'title="' . sprintf(__('View all posts filed under %'), attribute_escape($cat_name)) . '"';
                } else {
-                       $output .= "\t$link<br />\n";
+                       $output .= 'title="' . attribute_escape(apply_filters('category_description', $category->category_description, $category)) . '"';
                }
-
+               
+               $output .= '>' . $cat_name . '</a>';
+               
+               if (!empty($feed) || !empty($feed_image)) {
+                       $output .= ' ';
+                       
+                       if (empty($feed_image)) {
+                               $link .= '(<a href="' . get_category_rss_link(0, $category->cat_ID, $category->category_nicename) . '" title="' . attribute_escape($feed) . '">' . $feed . '</a>)';
+                       } else {
+                               $link .= '<a href="' . get_category_rss_link(0, $category->cat_ID, $category->category_nicename) . '" title="' . attribute_escape(sprintf(__('Feed for all posts filed under %s'), $cat_name)) . '"><img src="' . $feed_image . '" alt="' . attribute_escape(sprintf(__('Feed for all posts filed under %s'), $cat_name)) . '" /></a>';
+                       }
+               }
+               
+               if ($show_count) {
+                       $output .= ' (' . intval($category->category_count) . ')';
+               }
+               
+               if ($show_last_update) {
+                       $output .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
+               }
+               
+               $output .= $after;
+               
+               switch ($format) {
+                       case 'html':
+                               $output .= '</li>';
+                               break;
+               }
+               
+               $output .= "\n";
+               
                return $output;
        }
-
-       function end_el($output, $page, $depth, $args) {
-               if ( 'list' != $args['style'] )
-                       return $output;
-
-               $output .= "</li>\n";
-               return $output;
-       }
-
 }
 
 class Walker_CategoryDropdown extends Walker {
Index: wp-includes/category-template.php
===================================================================
--- wp-includes/category-template.php   (revision 5143)
+++ wp-includes/category-template.php   (working copy)
@@ -259,29 +259,68 @@
        else
                parse_str($args, $r);
 
-       $defaults = array('show_option_all' => '', 'orderby' => 'name',
-               'order' => 'ASC', 'show_last_update' => 0, 'style' => 'list',
-               'show_count' => 0, 'hide_empty' => 1, 'use_desc_for_title' => 1,
-               'child_of' => 0, 'feed' => '', 'feed_image' => '', 'exclude' => '',
-               'hierarchical' => true, 'title_li' => __('Categories'));
+       $defaults = array(
+               'show_option_all' => '', 
+               'orderby' => 'name',
+               'order' => 'ASC', 
+               'show_last_update' => false, 
+               'style' => 'list',
+               'show_count' => false, 
+               'hide_empty' => true, 
+               'use_desc_for_title' => true,
+               'child_of' => false, 
+               'feed' => '', 
+               'feed_image' => '', 
+               'exclude' => '', 
+               'hierarchical' => true, 
+               'title_li' => __('Categories'), 
+               'before' => '', 
+               'after' => '', 
+               'format' => 'html'
+       );
+       
        $r = array_merge($defaults, $r);
+       
        if ( !isset($r['pad_counts']) && $r['show_count'] && $r['hierarchical'] )
                $r['pad_counts'] = true;
+       
        if ( isset($r['show_date']) )
                $r['include_last_update_time'] = $r['show_date'];
+       
+       // Backwards compatability
+       if (empty($r['format']) && !empty($r['style'])) {
+               $r['format'] = $r['style'];
+               
+               // 'list' is the old version of 'html'
+               if ($r['format'] == 'list') {
+                       $r['format'] = 'html';
+               }
+       }
+       
        extract($r);
 
        $categories = get_categories($r);
 
        $output = '';
-       if ( $title_li && 'list' == $style )
-                       $output = '<li class="categories">' . $r['title_li'] . '<ul>';
+       
+       if ($style == 'list' && !empty($title_li)) {
+               $output .= '<li class="categories">' . $title_li . "\n";
+       }
 
        if ( empty($categories) ) {
-               if ( 'list' == $style )
-                       $output .= '<li>' . __("No categories") . '</li>';
-               else
-                       $output .= __("No categories");
+               switch ($format) {
+                       case 'html':
+                               $output .= "<ul>\n<li>";
+                               break;
+               }
+               
+               $output .= $before . __('No categories') . $after;
+               
+               switch ($format) {
+                       case 'html':
+                               $output .= "</li>\n</ul>";
+                               break;
+               }
        } else {
                global $wp_query;
 
@@ -292,12 +331,29 @@
                        $depth = 0;  // Walk the full depth.
                else
                        $depth = -1; // Flat.
+               
+               switch ($format) {
+                       case 'html':
+                               $output .= '<ul>';
+                               break;
+               }
+               
+               $output .= "\n";
 
                $output .= walk_category_tree($categories, $depth, $r);
+               
+               switch ($format) {
+                       case 'html':
+                               $output .= '</ul>';
+                               break;
+               }
+               
+               $output .= "\n";
        }
 
+       // Backwards compatability
        if ( $title_li && 'list' == $style )
-               $output .= '</ul></li>';
+               $output .= "</li>\n";
 
        echo apply_filters('wp_list_categories', $output);
 }