<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14217] trunk/wp-includes/query.php:
Ignore sticky posts which the current user cannot read,
Ignore sticky posts which have been explicitly excluded with 'post__not_in
'.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14217">14217</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-24 06:04:05 +0000 (Sat, 24 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ignore sticky posts which the current user cannot read, Ignore sticky posts which have been explicitly excluded with 'post__not_in'. Fixes <a href="http://trac.wordpress.org/ticket/11197">#11197</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14216 => 14217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-04-24 04:24:38 UTC (rev 14216)
+++ trunk/wp-includes/query.php 2010-04-24 06:04:05 UTC (rev 14217)
</span><span class="lines">@@ -2465,6 +2465,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // 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']);
+
</ins><span class="cx"> // Fetch sticky posts that weren't in the query results
</span><span class="cx"> if ( !empty($sticky_posts) ) {
</span><span class="cx"> $stickies__in = implode(',', array_map( 'absint', $sticky_posts ));
</span><span class="lines">@@ -2478,10 +2482,11 @@
</span><span class="cx"> }
</span><span class="cx"> $stickies_where = "AND $wpdb->posts.post_type IN ('" . $post_types . "')";
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $stickies = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE $wpdb->posts.ID IN ($stickies__in) $stickies_where" );
</span><del>- /** @todo Make sure post is published or viewable by the current user */
</del><span class="cx"> foreach ( $stickies as $sticky_post ) {
</span><del>- if ( 'publish' != $sticky_post->post_status )
</del><ins>+ // 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 )
</ins><span class="cx"> continue;
</span><span class="cx"> array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
</span><span class="cx"> $sticky_offset++;
</span></span></pre>
</div>
</div>
</body>
</html>