Changeset 16512 for trunk/wp-includes/taxonomy.php

Timestamp:

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

Author:

scribu

Message:

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

File:

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

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 )