Changeset 28436

Timestamp:

05/15/2014 05:57:13 PM (9 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in Walker_Category::start_el().

See #22400.

File:

• trunk/src/wp-includes/category-template.php (modified) (2 diffs)

trunk/src/wp-includes/category-template.php

@@ -963 +963 @@
      */
     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 );
-
-        $link = '<a href="' . esc_url( get_term_link($category) ) . '" ';
-        if ( $use_desc_for_title == 0 || empty($category->description) ) {
+        $cat_name = apply_filters(
+            'list_cats',
+            esc_attr( $category->name ),
+            $category
+        );
+
+        $link = '<a href="' . esc_url( get_term_link( $category ) ) . '" ';
+        if ( $args['use_desc_for_title'] == 0 || empty( $category->description ) ) {
             $link .= '';
         } else {
@@ -988 +988 @@
         $link .= $cat_name . '</a>';
 
-        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 .= '<a href="' . esc_url( get_term_feed_link( $category->term_id, $category->taxonomy, $feed_type ) ) . '"';
-
-            if ( empty($feed) ) {
+            }
+
+            $link .= '<a href="' . esc_url( get_term_feed_link( $category->term_id, $category->taxonomy, $args['feed_type'] ) ) . '"';
+
+            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 .= "<img src='$feed_image'$alt" . ' />';
-
+            } else {
+                $link .= "<img src='" . $args['feed_image'] . "'$alt" . ' />';
+            }
             $link .= '</a>';
 
-            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<li";
             $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 )
+            if ( ! empty( $args['current_category'] ) ) {
+                $_current_category = get_term( $args['current_category'], $category->taxonomy );
+                if ( $category->term_id == $args['current_category'] ) {
                     $class .=  ' current-cat';
-                elseif ( $category->term_id == $_current_category->parent )
+                } elseif ( $category->term_id == $_current_category->parent ) {
                     $class .=  ' current-cat-parent';
+                }
             }
             $output .=  ' class="' . $class . '"';