<!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>[13052] trunk/wp-includes:
Consult exclude_from_search when retrieving post_status = any.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13052">13052</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-10 22:36:50 +0000 (Wed, 10 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consult exclude_from_search when retrieving post_status = any. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13051 => 13052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-10 22:20:36 UTC (rev 13051)
+++ trunk/wp-includes/post.php 2010-02-10 22:36:50 UTC (rev 13052)
</span><span class="lines">@@ -86,12 +86,14 @@
</span><span class="cx">
</span><span class="cx"> register_post_status( 'trash', array( 'label' => _x('Trash', 'post'),
</span><span class="cx"> 'public' => true,
</span><ins>+ 'exclude_from_search' => true,
</ins><span class="cx"> '_builtin' => true,
</span><span class="cx"> 'label_count' => _n_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>')
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> register_post_status( 'auto-draft', array( 'label' => _x('Auto-Draft', 'post'),
</span><span class="cx"> 'public' => false,
</span><ins>+ 'exclude_from_search' => true,
</ins><span class="cx"> '_builtin' => true,
</span><span class="cx"> 'label_count' => _n_noop('Auto-Draft <span class="count">(%s)</span>', 'Auto-Drafts <span class="count">(%s)</span>')
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (13051 => 13052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-02-10 22:20:36 UTC (rev 13051)
+++ trunk/wp-includes/query.php 2010-02-10 22:36:50 UTC (rev 13052)
</span><span class="lines">@@ -2097,9 +2097,10 @@
</span><span class="cx"> $q_status = explode(',', $q['post_status']);
</span><span class="cx"> $r_status = array();
</span><span class="cx"> $p_status = array();
</span><ins>+ $e_status = array();
</ins><span class="cx"> if ( $q['post_status'] == 'any' ) {
</span><del>- // @todo Use register_post_status() data to determine which states should be excluded.
- $r_status[] = "$wpdb->posts.post_status <> 'trash'";
</del><ins>+ foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
+ $e_status[] = "$wpdb->posts.post_status <> '$status'";
</ins><span class="cx"> } else {
</span><span class="cx"> foreach ( get_post_stati() as $status ) {
</span><span class="cx"> if ( in_array( $status, $q_status ) ) {
</span><span class="lines">@@ -2116,6 +2117,9 @@
</span><span class="cx"> unset($p_status);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !empty($e_status) ) {
+ $statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+ }
</ins><span class="cx"> if ( !empty($r_status) ) {
</span><span class="cx"> if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type_cap}s") )
</span><span class="cx"> $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))";
</span></span></pre>
</div>
</div>
</body>
</html>