Ticket #4601: 4601 patch.patch

category-template.php

@@ -267 +267 @@
                 'child_of' => 0, 'feed' => '', 'feed_type' => '',
                 'feed_image' => '', 'exclude' => '',
                 'hierarchical' => true, 'title_li' => __('Categories'),
-                'echo' => 1, 'depth' => 0
+                'echo' => 1, 'depth' => 0, 'before' => '<li>', 'after' => '</li>',
+                'link_before' => '', 'link_after' => '',
+                
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -289 +291 @@
                         $output = '<li class="categories">' . $r['title_li'] . '<ul>';
 
         if ( empty($categories) ) {
-                if ( 'list' == $style )
-                        $output .= '<li>' . __("No categories") . '</li>';
-                else
-                        $output .= __("No categories");
+                        $output .= $before . __("No categories") . $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 .= $before;
+                                $output .= '<a href="' .  get_bloginfo('url')  . '">' . $link_before . $show_option_all . $link_after . '</a>';
+                                $output .= $after;
 
                 if ( is_category() )
                         $r['current_category'] = $wp_query->get_queried_object_id();