Ticket #8731: 8731.2.diff

wp-includes/query.php

@@ -1582 +1582 @@
                 $search = '';
                 $groupby = '';
                 $fields = "$wpdb->posts.*";
-                $post_status_join = false;
                 $page = 1;
 
                 if ( !isset($q['caller_get_posts']) )
@@ -1958 +1957 @@
                                         $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
                                         $post_type = 'any';
                                         $q['post_status'] = 'publish';
-                                        $post_status_join = true;
                                 } else {
                                         $whichcat = " AND 0 ";
                                 }
@@ -2065 +2063 @@
                 }
 
                 if ( 'any' == $post_type ) {
-                        $where .= '';
+                        $where .= " AND $wpdb->posts.post_type != 'revision'";
                 } elseif ( $this->is_attachment ) {
                         $where .= " AND $wpdb->posts.post_type = 'attachment'";
                 } elseif ($this->is_page) {
@@ -2111 +2109 @@
                                 else
                                         $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
                         }
-                        if ( $post_status_join ) {
-                                $join .= " JOIN $wpdb->posts AS p2 ON ($wpdb->posts.post_parent = p2.ID) ";
-                                foreach ( $statuswheres as $index => $statuswhere )
-                                        $statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
-                        }
                         foreach ( $statuswheres as $statuswhere )
                                 $where .= " AND $statuswhere";
                 } elseif ( !$this->is_singular ) {