Ticket #4601: 4601.diff

Index: wp-includes/category-template.php
===================================================================
--- wp-includes/category-template.php   (revision 15490)
+++ wp-includes/category-template.php   (working copy)
@@ -453,13 +453,17 @@
        $defaults = array(
                'show_option_all' => '', 'show_option_none' => __('No categories'),
                'orderby' => 'name', 'order' => 'ASC',
-               'show_last_update' => 0, 'style' => 'list',
+               'show_last_update' => 0, 
                'show_count' => 0, 'hide_empty' => 1,
                'use_desc_for_title' => 1, 'child_of' => 0,
                'feed' => '', 'feed_type' => '',
                'feed_image' => '', 'exclude' => '',
                'exclude_tree' => '', 'current_category' => 0,
                'hierarchical' => true, 'title_li' => __( 'Categories' ),
+               'list_before' => '<li class="%class">', 'list_after' => '</li>',
+               'categories_before' => '<ul>', 'categories_after' => '</ul>',
+               'element_before' => '<li>', 'element_after' => '</li>',
+               'title_before' => '', 'title_after' => '',
                'echo' => 1, 'depth' => 0,
                'taxonomy' => 'category'
        );
@@ -488,24 +492,19 @@
        $categories = get_categories( $r );
 
        $output = '';
-       if ( $title_li && 'list' == $style )
-                       $output = '<li class="' . $class . '">' . $title_li . '<ul>';
-
+       
+       if ( !empty( $title_li ) )
+               $output .=  str_replace( '%class', $class, $list_before ) . $title_before . $title_li . $title_after . $categories_before;
+       
        if ( empty( $categories ) ) {
                if ( ! empty( $show_option_none ) ) {
-                       if ( 'list' == $style )
-                               $output .= '<li>' . $show_option_none . '</li>';
-                       else
-                               $output .= $show_option_none;
+                       $output .= $element_before . $show_option_none . $element_after;
                }
        } else {
                global $wp_query;
 
                if( !empty( $show_option_all ) )
-                       if ( 'list' == $style )
-                               $output .= '<li><a href="' .  get_bloginfo( 'url' )  . '">' . $show_option_all . '</a></li>';
-                       else
-                               $output .= '<a href="' .  get_bloginfo( 'url' )  . '">' . $show_option_all . '</a>';
+                               $output .= $element_before . '<a href="' .  get_bloginfo( 'url' )  . '">' . $show_option_all . '</a>' . $element_after;
 
                if ( empty( $r['current_category'] ) && ( is_category() || is_tax() ) )
                        $r['current_category'] = $wp_query->get_queried_object_id();
@@ -518,8 +517,8 @@
                $output .= walk_category_tree( $categories, $depth, $r );
        }
 
-       if ( $title_li && 'list' == $style )
-               $output .= '</ul></li>';
+       if ( !empty( $title_li ) )
+               $output .= $categories_after . $list_after;
 
        $output = apply_filters( 'wp_list_categories', $output, $args );