Changeset 11420

Timestamp:

05/21/2009 12:10:04 AM (17 years ago)

Author:

ryan

Message:

Revert [11392]. It breaks custom taxonomies for attachments. see #8731

File:

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

trunk/wp-includes/query.php

@@ -1583 +1583 @@
                 $groupby = '';
                 $fields = "$wpdb->posts.*";
+                $post_status_join = false;
                 $page = 1;
 
@@ -1958 +1959 @@
                                         $post_type = 'any';
                                         $q['post_status'] = 'publish';
+                                        $post_status_join = true;
                                 } else {
                                         $whichcat = " AND 0 ";
@@ -2111 +2113 @@
                                 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 )