Changeset 28435

Timestamp:

05/15/2014 05:47:21 PM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_generate_tag_cloud().

See #22400.

File:

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

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

@@ -686 +686 @@
 
         $args = wp_parse_args( $args, $defaults );
-        extract( $args, EXTR_SKIP );
-
-        $return = ( 'array' === $format ) ? array() : '';
+
+        $return = ( 'array' === $args['format'] ) ? array() : '';
 
         if ( empty( $tags ) ) {
@@ -730 +729 @@
                 unset( $tags_sorted );
         } else {
-                if ( 'RAND' === $order ) {
+                if ( 'RAND' === $args['order'] ) {
                         shuffle( $tags );
                 } else {
                         // SQL cannot save you; this is a second (potentially different) sort on a subset of data.
-                        if ( 'name' === $orderby ) {
+                        if ( 'name' === $args['orderby'] ) {
                                 uasort( $tags, '_wp_object_name_sort_cb' );
                         } else {
@@ -740 +739 @@
                         }
 
-                        if ( 'DESC' === $order ) {
+                        if ( 'DESC' === $args['order'] ) {
                                 $tags = array_reverse( $tags, true );
                         }
@@ -746 +745 @@
         }
 
-        if ( $number > 0 )
-                $tags = array_slice($tags, 0, $number);
+        if ( $args['number'] > 0 )
+                $tags = array_slice( $tags, 0, $args['number'] );
 
         $counts = array();
@@ -753 +752 @@
         foreach ( (array) $tags as $key => $tag ) {
                 $real_counts[ $key ] = $tag->count;
-                $counts[ $key ] = $topic_count_scale_callback($tag->count);
+                $counts[ $key ] = call_user_func( $args['topic_count_scale_callback'], $tag->count );
         }
 
@@ -760 +759 @@
         if ( $spread <= 0 )
                 $spread = 1;
-        $font_spread = $largest - $smallest;
+        $font_spread = $args['largest'] - $args['smallest'];
         if ( $font_spread < 0 )
                 $font_spread = 1;
@@ -777 +776 @@
                         $title_attribute = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) );
                 } else {
-                        $title_attribute = call_user_func( $topic_count_text_callback, $real_count, $tag, $args );
+                        $title_attribute = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args );
                 }
 
                 $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( $title_attribute ) . "' style='font-size: " .
-                        str_replace( ',', '.', ( $smallest + ( ( $count - $min_count ) * $font_step ) ) )
-                        . "$unit;'>$tag_name</a>";
-        }
-
-        switch ( $format ) :
+                        str_replace( ',', '.', ( $args['smallest'] + ( ( $count - $min_count ) * $font_step ) ) )
+                        . $args['unit'] . ";'>$tag_name</a>";
+        }
+
+        switch ( $args['format'] ) :
         case 'array' :
                 $return =& $a;
@@ -795 +794 @@
                 break;
         default :
-                $return = join( $separator, $a );
+                $return = join( $args['separator'], $a );
                 break;
         endswitch;
 
-        if ( $filter ) {
+        if ( $args['filter'] ) {
                 /**
                  * Filter the generated output of a tag cloud.