Changeset 9031

Timestamp:

09/29/2008 09:24:24 PM (16 years ago)

Author:

ryan

Message:

tagnot_in and categorynot_in query fixes. see #7599

File:

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

trunk/wp-includes/query.php

@@ -1804 +1804 @@
             if ( $wpdb->has_cap( 'subqueries' ) ) {
                 $cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
-                $whichcat .= " AND $wpdb->posts.ID NOT IN (SELECT $wpdb->term_relationships.object_id FROM $wpdb->term_relationships WHERE $wpdb->term_relationships.term_taxonomy_id IN ($cat_string) )";
+                $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'category' AND tt.term_id IN ($cat_string) )";
             } else {
                 $ids = get_objects_in_term($q['category__not_in'], 'category');
                 if ( is_wp_error( $ids ) )
-                    return $ids;
+                    $ids = array();
                 if ( is_array($ids) && count($ids > 0) ) {
                     $out_posts = "'" . implode("', '", $ids) . "'";
@@ -1895 +1895 @@
 
         if ( !empty($q['tag__not_in']) ) {
-            $ids = get_objects_in_term($q['tag__not_in'], 'post_tag');
-            if ( is_array($ids) && count($ids > 0) ) {
-                $out_posts = "'" . implode("', '", $ids) . "'";
-                $whichcat .= " AND $wpdb->posts.ID NOT IN ($out_posts)";
+            if ( $wpdb->has_cap( 'subqueries' ) ) {
+                $tag_string = "'" . implode("', '", $q['tag__not_in']) . "'";
+                $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'post_tag' AND tt.term_id IN ($tag_string) )";
+            } else {
+                $ids = get_objects_in_term($q['tag__not_in'], 'post_tag');
+                if ( is_wp_error( $ids ) )
+                    $ids = array();
+                if ( is_array($ids) && count($ids > 0) ) {
+                    $out_posts = "'" . implode("', '", $ids) . "'";
+                    $whichcat .= " AND $wpdb->posts.ID NOT IN ($out_posts)";
+                }
             }
         }