sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Posts, Post Types: Revert [47179] pending test failures investigation.

Browse Source 
See #48653.

git-svn-id: https://develop.svn.wordpress.org/trunk@47180 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-02-04 23:00:53 +00:00
parent 9e5c22aa09
commit 5ada288488
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/wp-includes/class-wp-query.php
View File

@ -3066,43 +3066,37 @@ class WP_Query {
// Check post status to determine if post should be displayed. // Check post status to determine if post should be displayed.
if ( ! empty( $this->posts ) && ( $this->is_single || $this->is_page ) ) { if ( ! empty( $this->posts ) && ( $this->is_single || $this->is_page ) ) {
$status = get_post_status( $this->posts[0] ); $status = get_post_status( $this->posts[0] );
if ( 'attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent ) { if ( 'attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent ) {
$this->is_page = false; $this->is_page = false;
$this->is_single = true; $this->is_single = true;
$this->is_attachment = true; $this->is_attachment = true;
} }
$post_status_obj = get_post_status_object( $status );
// If the post_status was specifically requested, let it pass through. // If the post_status was specifically requested, let it pass through.
if ( ! in_array( $status, $q_status ) ) { if ( ! $post_status_obj->public && ! in_array( $status, $q_status ) ) {
$post_status_obj = get_post_status_object( $status );
if ( $post_status_obj && ! $post_status_obj->public ) { if ( ! is_user_logged_in() ) {
if ( ! is_user_logged_in() ) { // User must be logged in to view unpublished posts.
// User must be logged in to view unpublished posts. $this->posts = array();
$this->posts = array(); } else {
} else { if ( $post_status_obj->protected ) {
if ( $post_status_obj->protected ) { // User must have edit permissions on the draft to preview.
// User must have edit permissions on the draft to preview. if ( ! current_user_can( $edit_cap, $this->posts[0]->ID ) ) {
if ( ! current_user_can( $edit_cap, $this->posts[0]->ID ) ) { $this->posts = array();
$this->posts = array();
} else {
$this->is_preview = true;
if ( 'future' != $status ) {
$this->posts[0]->post_date = current_time( 'mysql' );
}
}
} elseif ( $post_status_obj->private ) {
if ( ! current_user_can( $read_cap, $this->posts[0]->ID ) ) {
$this->posts = array();
}
} else { } else {
$this->is_preview = true;
if ( 'future' != $status ) {
$this->posts[0]->post_date = current_time( 'mysql' );
}
}
} elseif ( $post_status_obj->private ) {
if ( ! current_user_can( $read_cap, $this->posts[0]->ID ) ) {
$this->posts = array(); $this->posts = array();
} }
} else {
$this->posts = array();
} }
} else {
// Post status is not registered, assume it's not public.
$this->posts = array();
} }
} }