Changeset 27709

Timestamp:

03/25/2014 12:59:17 PM (11 years ago)

Author:

nacin

Message:

Gracefully fail in wp_generate_tag_cloud() when emptiness is returned from the tag_cloud_sort filter.

props SergeyBiryukov.
fixes #27413.

File:

• trunk/src/wp-includes/category-template.php (modified) (1 diff)

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

@@ -713 +713 @@
      */
     $tags_sorted = apply_filters( 'tag_cloud_sort', $tags, $args );
-    if ( $tags_sorted != $tags  ) {
+    if ( empty( $tags_sorted ) ) {
+        return $return;
+    }
+
+    if ( $tags_sorted !== $tags ) {
         $tags = $tags_sorted;
-        unset($tags_sorted);
+        unset( $tags_sorted );
     } else {
-        if ( 'RAND' == $order ) {
-            shuffle($tags);
+        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 )
+            if ( 'name' === $orderby ) {
                 uasort( $tags, '_wp_object_name_sort_cb' );
-            else
+            } else {
                 uasort( $tags, '_wp_object_count_sort_cb' );
-
-            if ( 'DESC' == $order )
+            }
+
+            if ( 'DESC' === $order ) {
                 $tags = array_reverse( $tags, true );
+            }
         }
     }