Revert [11392]. It breaks custom taxonomies for attachments. see #8731
git-svn-id: http://svn.automattic.com/wordpress/trunk@11420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
2eafafa8c6
commit
cbe5ebd66d
|
@ -1582,6 +1582,7 @@ class WP_Query {
|
||||||
$search = '';
|
$search = '';
|
||||||
$groupby = '';
|
$groupby = '';
|
||||||
$fields = "$wpdb->posts.*";
|
$fields = "$wpdb->posts.*";
|
||||||
|
$post_status_join = false;
|
||||||
$page = 1;
|
$page = 1;
|
||||||
|
|
||||||
if ( !isset($q['caller_get_posts']) )
|
if ( !isset($q['caller_get_posts']) )
|
||||||
|
@ -1957,6 +1958,7 @@ class WP_Query {
|
||||||
$whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
|
$whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
|
||||||
$post_type = 'any';
|
$post_type = 'any';
|
||||||
$q['post_status'] = 'publish';
|
$q['post_status'] = 'publish';
|
||||||
|
$post_status_join = true;
|
||||||
} else {
|
} else {
|
||||||
$whichcat = " AND 0 ";
|
$whichcat = " AND 0 ";
|
||||||
}
|
}
|
||||||
|
@ -2111,6 +2113,11 @@ class WP_Query {
|
||||||
else
|
else
|
||||||
$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
|
$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 )
|
foreach ( $statuswheres as $statuswhere )
|
||||||
$where .= " AND $statuswhere";
|
$where .= " AND $statuswhere";
|
||||||
} elseif ( !$this->is_singular ) {
|
} elseif ( !$this->is_singular ) {
|
||||||
|
@ -2685,4 +2692,4 @@ function setup_postdata($post) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue