Ticket #9004: get_terms_fields_as_array.9004.diff

wp-includes/taxonomy.php

@@ -526 +526 @@
  * The 'list_terms_exclusions' filter passes the compiled exclusions along with
  * the $args.
  *
+ * The 'get_terms_orderby' filter passes the ORDER BY clause for the query 
+ * along with the $args array.
+
+ * The 'get_terms_fields' filter passes the fields for the SELECT query
+ * along with the $args array.
+ *
  * The list of arguments that $args can contain, which will overwrite the defaults:
  *
  * orderby - Default is 'name'. Can be name, count, or nothing (will use
@@ -673 +679 @@
                 $orderby = 't.term_group';
         else
                 $orderby = 't.term_id';
+        $orderby = apply_filters( 'get_terms_orderby', $orderby, $args );
 
         $where = '';
         $inclusions = '';
@@ -757 +764 @@
                 $where .= " AND (t.name LIKE '%$search%')";
         }
 
-        $select_this = '';
+        $selects = array();
         if ( 'all' == $fields )
-                $select_this = 't.*, tt.*';
+                $selects = array('t.*', 'tt.*');
         else if ( 'ids' == $fields )
-                $select_this = 't.term_id, tt.parent, tt.count';
+                $selects = array('t.term_id', 'tt.parent', 'tt.count');
         else if ( 'names' == $fields )
-                $select_this = 't.term_id, tt.parent, tt.count, t.name';
+                $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
+        $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
 
         $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where ORDER BY $orderby $order $limit";
 

wp-includes/category-template.php

@@ -573 +573 @@
  * 'format' argument will format the tags in a UL HTML list. The array value for
  * 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 'orderby' argument will accept 'name' or 'count' and defaults to 'name'.
  * The 'order' is the direction to sort, defaults to 'ASC' and can be 'DESC' or
  * 'RAND'.
@@ -618 +621 @@
         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 ) {