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

Timestamp:

01/09/2011 04:19:48 PM (14 years ago)

Author:

ryan

Message:

categoryand, tagand, tag_slugin, tag_slugand support. fixes #16157

File:

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

trunk/wp-includes/taxonomy.php

@@ -672 +672 @@
 
                 $where[] = "$alias.term_taxonomy_id $operator ($terms)";
-            }
-            elseif ( 'NOT IN' == $operator ) {
+            } elseif ( 'NOT IN' == $operator ) {
 
                 if ( empty( $terms ) )
@@ -684 +683 @@
                     FROM $wpdb->term_relationships
                     WHERE term_taxonomy_id IN ($terms)
+                )";
+            } elseif ( 'AND' == $operator ) {
+
+                if ( empty( $terms ) )
+                    continue;
+
+                $num_terms = count( $terms );
+
+                $terms = implode( ',', $terms );
+
+                $where[] = "$primary_table.$primary_id_column IN (
+                    SELECT object_id
+                    FROM $wpdb->term_relationships
+                    WHERE term_taxonomy_id IN ($terms)
+                    GROUP BY object_id HAVING COUNT(object_id) = $num_terms
                 )";
             }