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

Ignore sticky posts which the current user cannot read, Ignore sticky posts which have been explicitly excluded with 'post__not_in'. Fixes #11197 

git-svn-id: https://develop.svn.wordpress.org/trunk@14217 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2010-04-24 06:04:05 +00:00
parent e9ca3c961f
commit 4c6df3a2e4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/query.php
View File

@ -2465,6 +2465,10 @@ class WP_Query {
} }
} }
// If any posts have been excluded specifically, Ignore those that are sticky.
if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
// Fetch sticky posts that weren't in the query results // Fetch sticky posts that weren't in the query results
if ( !empty($sticky_posts) ) { if ( !empty($sticky_posts) ) {
$stickies__in = implode(',', array_map( 'absint', $sticky_posts )); $stickies__in = implode(',', array_map( 'absint', $sticky_posts ));
@ -2478,10 +2482,11 @@ class WP_Query {
} }
$stickies_where = "AND $wpdb->posts.post_type IN ('" . $post_types . "')"; $stickies_where = "AND $wpdb->posts.post_type IN ('" . $post_types . "')";
} }
$stickies = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE $wpdb->posts.ID IN ($stickies__in) $stickies_where" ); $stickies = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE $wpdb->posts.ID IN ($stickies__in) $stickies_where" );
/** @todo Make sure post is published or viewable by the current user */
foreach ( $stickies as $sticky_post ) { foreach ( $stickies as $sticky_post ) {
if ( 'publish' != $sticky_post->post_status ) // Ignore sticky posts the current user cannot read or are not published.
if ( !current_user_can('read_post', $sticky_post->ID) || 'publish' != $sticky_post->post_status )
continue; continue;
array_splice($this->posts, $sticky_offset, 0, array($sticky_post)); array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
$sticky_offset++; $sticky_offset++;