Changeset 6021

Timestamp:

09/03/07 18:14:05 (10 months ago)

Author:

ryan

Message:

Tag unions and intersections. fixes #4895

Files:

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

trunk/wp-includes/classes.php

@@ -2 +2 @@
-
-class WP {
-tag_id', '
-
-
+
+
+, 'tag_slug__in', 'tag_slug__and', 'tag_id'
-    var $extra_query_vars = array();
-

trunk/wp-includes/query.php

@@ -421 +421 @@
-
-        $array_keys = array('category__in', 'category__not_in', 'category__and',
-
+, 'tag_slug__in', 'tag_slug__and'
-        
-        foreach ( $array_keys as $key ) {
@@ -607 +607 @@
-                $qv['tag__and'] = array_map('intval', $qv['tag__and']);
-                $this->is_category = true;  
+            }
+
+            if ( !is_array($qv['tag_slug__in']) || empty($qv['tag_slug__in']) ) {
+                $qv['tag_slug__in'] = array();
+            } else {
+                $qv['tag_slug__in'] = array_map('sanitize_title', $qv['tag_slug__in']);
+                $this->is_tag = true;   
+            }
+
+            if ( !is_array($qv['tag_slug__and']) || empty($qv['tag_slug__amd']) ) {
+                $qv['tag_slug__and'] = array();
+            } else {
+                $qv['tag_slug__and'] = array_map('sanitize_title', $qv['tag_slug__and']);
+                $this->is_tag = true;   
-            }
-
@@ -985 +999 @@
-        // Tags
-        if ( '' != $q['tag'] ) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            $groupby = "{$wpdb->posts}.ID";
-        }
@@ -1006 +1036 @@
-        }
-
+        if ( !empty($q['tag_slug__in']) ) {
+            $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) LEFT JOIN $wpdb->terms ON ($wpdb->term_taxonomy.term_id = $wpdb->terms.term_id) ";
+            $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
+            $include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'";
+            $whichcat .= " AND $wpdb->terms.slug IN ($include_tags) ";
+        }
+
-        if ( !empty($q['tag__not_in']) ) {
-            $ids = get_objects_in_term($q['tag__not_in'], 'post_tag');
@@ -1014 +1051 @@
-        }
-
-
+slug_
-            $count = 0;
-
-
-t$count.term_id
+slug_
+LEFT JOIN $wpdb->terms AS term$count ON (tt$count.term_id = term$count.term_id) 
+erm$count.slug
-                $count++;
-            }