Changeset 15650

Timestamp:

09/23/2010 11:19:47 PM (16 years ago)

Author:

scribu

Message:

Consistently set $post_type to 'any' when a taxonomy query is involved. See [15649]. See #14589

File:

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

trunk/wp-includes/query.php

@@ -1830 +1830 @@
                                 }
                         }
-
-                        if ( empty($post_type) ) {
-                                $post_type = 'any';
-                                $post_status_join = true;
-                        } elseif ( in_array('attachment', (array) $post_type) ) {
-                                $post_status_join = true;
-                        }
                 }
 
@@ -1921 +1914 @@
                 if ( !empty( $tax_query ) ) {
                         $this->tax_query = $tax_query;
+
+                        if ( empty($post_type) ) {
+                                $post_type = 'any';
+                                $post_status_join = true;
+                        } elseif ( in_array('attachment', (array) $post_type) ) {
+                                $post_status_join = true;
+                        }
 
                         $where .= " AND $wpdb->posts.ID IN( " . implode( ', ', wp_tax_query( $tax_query ) ) . ")";