Changeset 11348 for trunk/wp-includes/query.php

Timestamp:

05/15/2009 11:47:28 PM (15 years ago)

Author:

ryan

Message:

Allow combining category and tag queries. Props turboguy. fixes #5433

File:

• trunk/wp-includes/query.php (modified) (5 diffs)

trunk/wp-includes/query.php

@@ -1856 +1856 @@
                     $q['tag_slug__in'][] = $tag;
                 }
-            } else if ( preg_match('/[+\s]+/', $q['tag']) ) {
+            } else if ( preg_match('/[+\s]+/', $q['tag']) || !empty($q['cat']) ) {
                 $tags = preg_split('/[+\s]+/', $q['tag']);
                 foreach ( (array) $tags as $tag ) {
@@ -1872 +1872 @@
         }
 
-        if ( !empty($q['tag__in']) ) {
+        if ( !empty($q['tag__in']) && empty($q['cat']) ) {
             $join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
             $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
@@ -1882 +1882 @@
         }
 
-        if ( !empty($q['tag_slug__in']) ) {
+        if ( !empty($q['tag_slug__in']) && empty($q['cat']) ) {
             $join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) INNER JOIN $wpdb->terms ON ($wpdb->term_taxonomy.term_id = $wpdb->terms.term_id) ";
             $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
@@ -1904 +1904 @@
 
         // Tag and slug intersections.
-        $intersections = array('category__and' => 'category', 'tag__and' => 'post_tag', 'tag_slug__and' => 'post_tag');
+        $intersections = array('category__and' => 'category', 'tag__and' => 'post_tag', 'tag_slug__and' => 'post_tag', 'tag__in' => 'post_tag', 'tag_slug__in' => 'post_tag');
+        $tagin = array('tag__in', 'tag_slug__in'); // These are used to make some exceptions below
         foreach ($intersections as $item => $taxonomy) {
             if ( empty($q[$item]) ) continue;
-
+            if ( in_array($item, $tagin) && empty($q['cat']) ) continue; // We should already have what we need if categories aren't being used
+            
             if ( $item != 'category__and' ) {
                 $reqtag = is_term( $q[$item][0], 'post_tag' );
@@ -1914 +1916 @@
             }
 
-            $taxonomy_field = $item == 'tag_slug__and' ? 'slug' : 'term_id';
+            $taxonomy_field = $item == ('tag_slug__and' || 'tag_slug__in') ? 'slug' : 'term_id';
 
             $q[$item] = array_unique($q[$item]);
             $tsql = "SELECT p.ID FROM $wpdb->posts p INNER JOIN $wpdb->term_relationships tr ON (p.ID = tr.object_id) INNER JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) INNER JOIN $wpdb->terms t ON (tt.term_id = t.term_id)";
             $tsql .= " WHERE tt.taxonomy = '$taxonomy' AND t.$taxonomy_field IN ('" . implode("', '", $q[$item]) . "')";
-            $tsql .= " GROUP BY p.ID HAVING count(p.ID) = " . count($q[$item]);
-
+            if ( !in_array($item, $tagin) ) { // This next line is only helpful if we are doing an and relationship
+                $tsql .= " GROUP BY p.ID HAVING count(p.ID) = " . count($q[$item]);
+            }
             $post_ids = $wpdb->get_col($tsql);