Ticket #4711: 4711.diff

wp-includes/post.php

@@ -41 +41 @@
         }
 
         $defaults = array(
-                'numberposts' => -1, 'post_type' => '', 
+                'numberposts' => -1, 'post_type' => '',
                 'post_status' => '', 'post_parent' => 0
         );
 
@@ -194 +194 @@
         global $wpdb;
 
         $defaults = array(
-                'numberposts' => 5, 'offset' => 0, 
-                'category' => 0, 'orderby' => 'post_date', 
-                'order' => 'DESC', 'include' => '', 
-                'exclude' => '', 'meta_key' => '', 
-                'meta_value' =>'', 'post_type' => 'post', 
-                'post_status' => 'publish', 'post_parent' => 0
+                'numberposts' => 5, 'offset' => 0,
+                'category' => 0, 'orderby' => 'post_date',
+                'order' => 'DESC', 'include' => '',
+                'exclude' => '', 'meta_key' => '',
+                'meta_value' =>'', 'post_type' => 'post',
+                'post_parent' => 0
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -248 +248 @@
                 $exclusions .= ')';
 
         $query  = "SELECT DISTINCT * FROM $wpdb->posts ";
-        $query .= empty( $category ) ? '' : ", $wpdb->term_relationships, $wpdb->term_taxonomy  "; 
+        $query .= empty( $category ) ? '' : ", $wpdb->term_relationships, $wpdb->term_taxonomy  ";
         $query .= empty( $meta_key ) ? '' : ", $wpdb->postmeta ";
         $query .= " WHERE 1=1 ";
         $query .= empty( $post_type ) ? '' : "AND post_type = '$post_type' ";
-        $query .= empty( $post_status ) ? '' : "AND post_status = '$post_status' ";
+        $query .= 'AND '.get_private_posts_cap_sql('post').' ';
         $query .= "$exclusions $inclusions " ;
         $query .= empty( $category ) ? '' : "AND ($wpdb->posts.ID = $wpdb->term_relationships.object_id AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id AND $wpdb->term_taxonomy.term_id = " . $category. ") ";
         $query .= empty( $post_parent ) ? '' : "AND $wpdb->posts.post_parent = '$post_parent' ";
@@ -428 +428 @@
                 if ( $do_object )
                         $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
                 else
-                        $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);      
+                        $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
         }
 
         return $post;
@@ -1100 +1100 @@
         global $wpdb;
 
         $defaults = array(
-                'child_of' => 0, 'sort_order' => 'ASC', 
-                'sort_column' => 'post_title', 'hierarchical' => 1, 
-                'exclude' => '', 'include' => '', 
-                'meta_key' => '', 'meta_value' => '', 
+                'child_of' => 0, 'sort_order' => 'ASC',
+                'sort_column' => 'post_title', 'hierarchical' => 1,
+                'exclude' => '', 'include' => '',
+                'meta_key' => '', 'meta_value' => '',
                 'authors' => ''
         );
 
@@ -1117 +1117 @@
 
         $inclusions = '';
         if ( !empty($include) ) {
-                $child_of = 0; //ignore child_of, exclude, meta_key, and meta_value params if using include 
+                $child_of = 0; //ignore child_of, exclude, meta_key, and meta_value params if using include
                 $exclude = '';
                 $meta_key = '';
                 $meta_value = '';
@@ -1146 +1146 @@
                         }
                 }
         }
-        if (!empty($exclusions)) 
+        if (!empty($exclusions))
                 $exclusions .= ')';
 
         $author_query = '';
@@ -1176 +1176 @@
         }
 
         $query = "SELECT * FROM $wpdb->posts " ;
-        $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " ) ; 
-        $query .= " WHERE (post_type = 'page' AND post_status = 'publish') $exclusions $inclusions " ;
+        $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " ) ;
+        $query .= " WHERE (post_type = 'page' AND ".get_private_posts_cap_sql('page').") $exclusions $inclusions " ;
         $query .= ( empty( $meta_key ) | empty($meta_value)  ? "" : " AND ($wpdb->posts.ID = $wpdb->postmeta.post_id AND $wpdb->postmeta.meta_key = '$meta_key' AND $wpdb->postmeta.meta_value = '$meta_value' )" ) ;
         $query .= $author_query;
         $query .= " ORDER BY " . $sort_column . " " . $sort_order ;
@@ -1606 +1606 @@
  * SQL code that can be added to a WHERE clause; this SQL is constructed
  * to allow all published posts, and all private posts to which the user
  * has access.
- * 
+ *
  * @param string $post_type currently only supports 'post' or 'page'.
  * @return string SQL code that can be added to a where clause.
  */