<!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>[15589] trunk/wp-includes:
Rename caller_get_posts WP_Query flag to ignore_sticky_posts,
because that is the only thing it does.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15589">15589</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-09-07 04:46:08 +0000 (Tue, 07 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename caller_get_posts WP_Query flag to ignore_sticky_posts, because that is the only thing it does. fixes <a href="http://trac.wordpress.org/ticket/14624">#14624</a>. props scribu</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (15588 => 15589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-09-07 04:40:53 UTC (rev 15588)
+++ trunk/wp-includes/default-widgets.php 2010-09-07 04:46:08 UTC (rev 15589)
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> else if ( $number > 15 )
</span><span class="cx"> $number = 15;
</span><span class="cx">
</span><del>- $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
</del><ins>+ $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
</ins><span class="cx"> if ($r->have_posts()) :
</span><span class="cx"> ?>
</span><span class="cx"> <?php echo $before_widget; ?>
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15588 => 15589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-09-07 04:40:53 UTC (rev 15588)
+++ trunk/wp-includes/post.php 2010-09-07 04:46:08 UTC (rev 15589)
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx"> } elseif ( ! empty($r['exclude']) )
</span><span class="cx"> $r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
</span><span class="cx">
</span><del>- $r['caller_get_posts'] = true;
</del><ins>+ $r['ignore_sticky_posts'] = true;
</ins><span class="cx"> $r['no_found_rows'] = true;
</span><span class="cx">
</span><span class="cx"> $get_posts = new WP_Query;
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15588 => 15589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-09-07 04:40:53 UTC (rev 15588)
+++ trunk/wp-includes/query.php 2010-09-07 04:46:08 UTC (rev 15589)
</span><span class="lines">@@ -1540,9 +1540,15 @@
</span><span class="cx"> $post_status_join = false;
</span><span class="cx"> $page = 1;
</span><span class="cx">
</span><del>- if ( !isset($q['caller_get_posts']) )
- $q['caller_get_posts'] = false;
</del><ins>+ if ( isset( $q['caller_get_posts'] ) ) {
+ _deprecated_argument( 'WP_Query', '3.1', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
+ if ( !isset( $q['ignore_sticky_posts'] ) )
+ $q['ignore_sticky_posts'] = $q['caller_get_posts'];
+ }
</ins><span class="cx">
</span><ins>+ if ( !isset( $q['ignore_sticky_posts'] ) )
+ $q['ignore_sticky_posts'] = false;
+
</ins><span class="cx"> if ( !isset($q['suppress_filters']) )
</span><span class="cx"> $q['suppress_filters'] = false;
</span><span class="cx">
</span><span class="lines">@@ -2377,7 +2383,7 @@
</span><span class="cx">
</span><span class="cx"> // Put sticky posts at the top of the posts array
</span><span class="cx"> $sticky_posts = get_option('sticky_posts');
</span><del>- if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['caller_get_posts'] ) {
</del><ins>+ if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_sticky_posts'] ) {
</ins><span class="cx"> $num_posts = count($this->posts);
</span><span class="cx"> $sticky_offset = 0;
</span><span class="cx"> // Loop over posts and relocate stickies to the front.
</span></span></pre>
</div>
</div>
</body>
</html>