Changeset 14121

Timestamp:

04/17/2010 09:03:33 AM (14 years ago)

Author:

dd32

Message:

Respect the post_type param for Taxonomy Queries, Props Otto & Dougal Campbell. Restrict Attachment post_status joins to queries involving attachment results ("any" or "attachment"). See #13020

File:

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

trunk/wp-includes/query.php

@@ -2032 +2032 @@
                 if ( !is_wp_error($post_ids) && !empty($post_ids) ) {
                     $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
-                    $post_type = 'any';
+                    if ( '' === $post_type ) {
+                        $post_type = 'any';
+                        $post_status_join = true;
+                    } elseif ( in_array('attachment', (array)$post_type) ) {
+                        $post_status_join = true;
+                    }
                     $q['post_status'] = 'publish';
-                    $post_status_join = true;
                 } else {
                     $whichcat = " AND 0 ";
@@ -2293 +2297 @@
         if ( empty($q['nopaging']) && !$this->is_singular ) {
             $page = absint($q['paged']);
-            if (empty($page)) {
+            if ( empty($page) )
                 $page = 1;
-            }
 
             if ( empty($q['offset']) ) {