Ticket #29718: 29718.3.diff

wp-includes/taxonomy.php

@@ -997 +997 @@
                 );
 
                 $join = '';
+                $where = '';
 
                 $this->clean_query( $clause );
 
@@ -1040 +1041 @@
 
                 } elseif ( 'NOT IN' == $operator ) {
 
-                        if ( empty( $terms ) ) {
-                                continue;
-                        }
+                        if ( ! empty( $terms ) ) {
+                            $terms = implode( ',', $terms );
+    
+                            $where = "$this->primary_table.$this->primary_id_column NOT IN (
+                                    SELECT object_id
+                                    FROM $wpdb->term_relationships
+                                    WHERE term_taxonomy_id IN ($terms)
+                            )";
+                        }
 
-                        $terms = implode( ',', $terms );
-
-                        $where = "$this->primary_table.$this->primary_id_column NOT IN (
-                                SELECT object_id
-                                FROM $wpdb->term_relationships
-                                WHERE term_taxonomy_id IN ($terms)
-                        )";
-
                 } elseif ( 'AND' == $operator ) {
+                        if ( ! empty( $terms ) ) {
+                            $num_terms = count( $terms );
+    
+                            $terms = implode( ',', $terms );
+    
+                            $where = "(
+                                    SELECT COUNT(1)
+                                    FROM $wpdb->term_relationships
+                                    WHERE term_taxonomy_id IN ($terms)
+                                    AND object_id = $this->primary_table.$this->primary_id_column
+                            ) = $num_terms";
+                        }
 
-                        if ( empty( $terms ) ) {
-                                continue;
-                        }
-
-                        $num_terms = count( $terms );
-
-                        $terms = implode( ',', $terms );
-
-                        $where = "(
-                                SELECT COUNT(1)
-                                FROM $wpdb->term_relationships
-                                WHERE term_taxonomy_id IN ($terms)
-                                AND object_id = $this->primary_table.$this->primary_id_column
-                        ) = $num_terms";
-
                 } elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
 
                         $where = $wpdb->prepare( "$operator (