diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 25d6da9c2e..21266fb60f 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -962,15 +962,15 @@ class Walker_Category extends Walker {
* @param int $id ID of the current category.
*/
function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
- extract($args);
-
- $cat_name = esc_attr( $category->name );
-
/** This filter is documented in wp-includes/category-template.php */
- $cat_name = apply_filters( 'list_cats', $cat_name, $category );
+ $cat_name = apply_filters(
+ 'list_cats',
+ esc_attr( $category->name ),
+ $category
+ );
- $link = 'description) ) {
+ $link = 'description ) ) {
$link .= '';
} else {
/**
@@ -987,47 +987,50 @@ class Walker_Category extends Walker {
$link .= '>';
$link .= $cat_name . '';
- if ( !empty($feed_image) || !empty($feed) ) {
+ if ( ! empty( $args['feed_image'] ) || ! empty( $args['feed'] ) ) {
$link .= ' ';
- if ( empty($feed_image) )
+ if ( empty( $args['feed_image'] ) ) {
$link .= '(';
+ }
- $link .= 'term_id, $category->taxonomy, $args['feed_type'] ) ) . '"';
- if ( empty($feed) ) {
+ if ( empty( $args['feed'] ) ) {
$alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
} else {
- $alt = ' alt="' . $feed . '"';
- $name = $feed;
- $link .= $title;
+ $alt = ' alt="' . $args['feed'] . '"';
+ $name = $args['feed'];
+ $link .= $args['title'];
}
$link .= '>';
- if ( empty($feed_image) )
+ if ( empty( $args['feed_image'] ) ) {
$link .= $name;
- else
- $link .= "';
-
+ } else {
+ $link .= "
';
+ }
$link .= '';
- if ( empty($feed_image) )
+ if ( empty( $args['feed_image'] ) ) {
$link .= ')';
+ }
}
- if ( !empty($show_count) )
+ if ( ! empty( $args['show_count'] ) ) {
$link .= ' (' . number_format_i18n( $category->count ) . ')';
-
+ }
if ( 'list' == $args['style'] ) {
$output .= "\t