Changeset 16056

Timestamp:

10/28/2010 05:55:30 PM (11 years ago)

Author:

scribu

Message:

Add terms_clauses filter. Props sc0ttkclark for initial patch. See #15020

File:

• trunk/wp-includes/taxonomy.php (modified) (5 diffs)

trunk/wp-includes/taxonomy.php

@@ -919 +919 @@
     }
 
-    $in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
-
     $defaults = array('orderby' => 'name', 'order' => 'ASC',
         'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
@@ -942 +940 @@
         $args['pad_counts'] = false;
     }
+
     extract($args, EXTR_SKIP);
 
@@ -992 +991 @@
         $order = '';
 
-    $where = '';
+    $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
     $inclusions = '';
     if ( !empty($include) ) {
@@ -1059 +1058 @@
     if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' === $parent ) {
         if ( $offset )
-            $limit = 'LIMIT ' . $offset . ',' . $number;
+            $limits = 'LIMIT ' . $offset . ',' . $number;
         else
-            $limit = 'LIMIT ' . $number;
+            $limits = 'LIMIT ' . $number;
     } else {
-        $limit = '';
+        $limits = '';
     }
 
@@ -1088 +1087 @@
             $selects = array('COUNT(*)');
     }
-    $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 $orderby $order $limit";
+
+    $_fields = $fields;
+
+    $fields = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
+
+    $join = "INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
+
+    $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
+    $clauses = apply_filters( 'terms_clauses', compact( $pieces ), $taxonomies, $args );
+    foreach ( $pieces as $piece )
+        $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
+
+    $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";    
+
+    $fields = $_fields;
 
     if ( 'count' == $fields ) {