Ticket #27088: 27088.diff

src/wp-includes/query.php

@@ -2974 +2974 @@
 
                 // Check post status to determine if post should be displayed.
                 if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
+                        $display = true;
                         $status = get_post_status($this->posts[0]);
                         $post_status_obj = get_post_status_object($status);
-                        //$type = get_post_type($this->posts[0]);
                         if ( !$post_status_obj->public ) {
                                 if ( ! is_user_logged_in() ) {
                                         // User must be logged in to view unpublished posts.
-                                        $this->posts = array();
+                                        $display = false;
                                 } else {
                                         if  ( $post_status_obj->protected ) {
                                                 // User must have edit permissions on the draft to preview.
                                                 if ( ! current_user_can($edit_cap, $this->posts[0]->ID) ) {
-                                                        $this->posts = array();
+                                                        $display = false;
                                                 } else {
                                                         $this->is_preview = true;
                                                         if ( 'future' != $status )
@@ -2993 +2993 @@
                                                 }
                                         } elseif ( $post_status_obj->private ) {
                                                 if ( ! current_user_can($read_cap, $this->posts[0]->ID) )
-                                                        $this->posts = array();
+                                                        $display = false;
                                         } else {
-                                                $this->posts = array();
+                                                $display = false;
                                         }
                                 }
                         }
 
+                        if ( ! apply_filters( 'user_can_view_post', $display, $post_status_obj ) ) {
+                                $this->posts = array();
+                                // and/or: store the old results in a WP_Query property? could be resurrected on the the_posts filter
+                        }
+
                         if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) )
                                 $this->posts[0] = get_post( apply_filters_ref_array( 'the_preview', array( $this->posts[0], &$this ) ) );
                 }