Changeset 11744

Timestamp:

07/26/2009 01:23:46 AM (17 years ago)

Author:

azaozz

Message:

Fix wp_tag_cloud('order=RAND'), don't pre-sort if filter 'tag_cloud_sort' is used to sort the tags, props Joern_W, fixes #10393

File:

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

trunk/wp-includes/category-template.php

@@ -574 +574 @@
  * the 'format' argument will return in PHP array type format.
  *
- * The 'tag_cloud_sort' filter allows you to override the sorting done
- * by the 'orderby' argument; passed to the filter: $tags array and $args array.
+ * The 'tag_cloud_sort' filter allows you to override the sorting.
+ * Passed to the filter: $tags array and $args array, has to return the $tags array
+ * after sorting it.
  *
  * The 'orderby' argument will accept 'name' or 'count' and defaults to 'name'.
@@ -605 +606 @@
         if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
                 $body = 'return sprintf (
-                        _n('.var_export($args['single_text'], true).', '.var_export($args['multiple_text'], true).', $count),
+                        _n(' . var_export($args['single_text'], true) . ', ' . var_export($args['multiple_text'], true) . ', $count),
                         number_format_i18n( $count ));';
                 $args['topic_count_text_callback'] = create_function('$count', $body);
@@ -611 +612 @@
 
         $args = wp_parse_args( $args, $defaults );
-
         extract( $args );
 
@@ -617 +617 @@
                 return;
 
-        // SQL cannot save you; this is a second (potentially different) sort on a subset of data.
-        if ( 'name' == $orderby )
-                uasort( $tags, create_function('$a, $b', 'return strnatcasecmp($a->name, $b->name);') );
-        else
-                uasort( $tags, create_function('$a, $b', 'return ($a->count > $b->count);') );
-
-        $tags = apply_filters( 'tag_cloud_sort', $tags, $args );
-
-        if ( 'DESC' == $order )
-                $tags = array_reverse( $tags, true );
-        elseif ( 'RAND' == $order ) {
-                $keys = (array) array_rand( $tags, count( $tags ) );
-                $temp = array();
-                foreach ( $keys as $key )
-                        $temp[$key] = $tags[$key];
-
-                $tags = $temp;
-                $temp = null;
-                unset( $temp );
+        $tags_sorted = apply_filters( 'tag_cloud_sort', $tags, $args );
+        if ( $tags_sorted != $tags  ) { // the tags have been sorted by a plugin
+                $tags = $tags_sorted;
+                unset($tags_sorted);
+        } else {
+                if ( 'RAND' == $order ) {
+                        shuffle($tags);
+                } else {
+                        // SQL cannot save you; this is a second (potentially different) sort on a subset of data.
+                        if ( 'name' == $orderby )
+                                uasort( $tags, create_function('$a, $b', 'return strnatcasecmp($a->name, $b->name);') );
+                        else
+                                uasort( $tags, create_function('$a, $b', 'return ($a->count > $b->count);') );
+
+                        if ( 'DESC' == $order )
+                                $tags = array_reverse( $tags, true );
+                }
         }