vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-30 18:24:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow draft pages. Use post_type for object types. Reserve post_status strictly for status. fixes #1820

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@3510 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2006-02-09 10:03:48 +00:00
parent db5355013c
commit f961003343
21 changed files with 143 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/classes.php
View File

@@ -593,23 +593,20 @@ class WP_Query {
}
if ( $this->is_attachment ) {
$where .= ' AND (post_status = "attachment")';
$where .= ' AND (post_type = "attachment")';
} elseif ($this->is_page) {
$where .= ' AND (post_status = "static")';
$where .= ' AND (post_type = "page")';
} elseif ($this->is_single) {
$where .= ' AND (post_status != "static")';
$where .= ' AND (post_type = "post")';
} else {
$where .= ' AND (post_status = "publish"';
$where .= ' AND (post_type = "post" AND post_status = "publish"';
if (isset($user_ID) && ('' != intval($user_ID)))
$where .= " OR post_author = $user_ID AND post_status != 'draft' AND post_status != 'static')";
$where .= " OR post_author = $user_ID AND post_status = 'private')";
else
$where .= ')';
}
if (! $this->is_attachment )
$where .= ' AND post_status != "attachment"';
// Apply filters on where and join prior to paging so that any
// manipulations to them are reflected in the paging by day queries.
$where = apply_filters('posts_where', $where);
@@ -654,10 +651,10 @@ class WP_Query {
$this->posts = $wpdb->get_results($this->request);
// Check post status to determine if post should be displayed.
if ($this->is_single) {
if ($this->is_single || $this->is_page) {
$status = get_post_status($this->posts[0]);
if ( ('publish' != $status) && ('static' != $status) ) {
if ( ! (isset($user_ID) && ('' != intval($user_ID))) ) {
if ( ('publish' != $status) ) {
if ( ! is_user_logged_in() ) {
// User must be logged in to view unpublished posts.
$this->posts = array();
} else {