Changeset 16512

Timestamp:

11/20/2010 09:28:50 PM (16 years ago)

Author:

scribu

Message:

Fix logic for when excluding a non-existant term. See #12891

Location:

trunk/wp-includes

Files:

• query.php (modified) (1 diff)
• taxonomy.php (modified) (4 diffs)

trunk/wp-includes/query.php

@@ -1948 +1948 @@
                         $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
 
-                        if ( empty($clauses['join']) && empty($clauses['where']) ) {
-                                $where .= ' AND 0 = 1'; 
-                        } else {
-                                $join .= $clauses['join'];
-                                $where .= $clauses['where'];
-                        }
+                        $join .= $clauses['join'];
+                        $where .= $clauses['where'];
 
                         if ( $this->is_tax ) {

trunk/wp-includes/taxonomy.php

@@ -553 +553 @@
                         _transform_terms( $terms, $taxonomies, $field, 'term_id' );
 
-                        if ( empty( $terms ) )
-                                continue;
-
                         $children = array();
                         foreach ( $terms as $term ) {
@@ -569 +566 @@
                 }
 
-                if ( empty( $terms ) )
-                        continue;
-
-                $terms = implode( ',', $terms );
-
                 if ( 'IN' == $operator ) {
+                        if ( empty( $terms ) )
+                                return array( 'join' => '', 'where' => ' AND 0 = 1');
+
+                        $terms = implode( ',', $terms );
+
                         $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
 
@@ -586 +583 @@
                 }
                 elseif ( 'NOT IN' == $operator ) {
+                        if ( empty( $terms ) )
+                                continue;
+
+                        $terms = implode( ',', $terms );
+
                         $where .= " AND $primary_table.$primary_id_column NOT IN (
                                 SELECT object_id 
@@ -599 +601 @@
 function _transform_terms( &$terms, $taxonomies, $field, $resulting_field ) {
         global $wpdb;
+
+        if ( empty( $terms ) )
+                return;
 
         if ( $field == $resulting_field )