Changeset 16467

Timestamp:

11/18/2010 07:04:47 PM (16 years ago)

Author:

markjaquith

Message:

Exclude term exclusions even if they are also inclusions. props foofy, scribu. see #12891

File:

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

trunk/wp-includes/taxonomy.php

@@ -543 +543 @@
                 }
 
-                if ( !in_array( $operator, array( 'IN', 'NOT IN' ) ) )
-                        $operator = 'IN';
-
                 $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
 
@@ -588 +585 @@
                         $i++;
                 }
-                else {
-                        // NOT IN is very slow for some reason
-                        $where .= " AND $primary_table.$primary_id_column IN (
-                                SELECT object_id
-                                FROM $wpdb->term_relationships
-                                WHERE term_taxonomy_id $operator ($terms)
+                elseif ( 'NOT IN' == $operator ) {
+                        $where .= " AND $primary_table.$primary_id_column NOT IN (
+                                SELECT object_id 
+                                FROM $wpdb->term_relationships 
+                                WHERE term_taxonomy_id IN ($terms)
                         )";
                 }
         }
-
         return compact( 'join', 'where' );
 }