<!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>[12303] trunk: Don't show deleted Pages in wp.getPages results, props ryan,
props Denis-de-Bernardy,fixes #11243</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12303">12303</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-12-01 08:14:42 +0000 (Tue, 01 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't show deleted Pages in wp.getPages results, props ryan, props Denis-de-Bernardy,fixes <a href="http://trac.wordpress.org/ticket/11243">#11243</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.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 (12302 => 12303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2009-12-01 07:46:36 UTC (rev 12302)
+++ trunk/wp-includes/query.php 2009-12-01 08:14:42 UTC (rev 12303)
</span><span class="lines">@@ -2108,20 +2108,25 @@
</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><del>- if ( in_array( 'draft' , $q_status ) )
- $r_status[] = "$wpdb->posts.post_status = 'draft'";
- if ( in_array( 'pending', $q_status ) )
- $r_status[] = "$wpdb->posts.post_status = 'pending'";
- if ( in_array( 'future' , $q_status ) )
- $r_status[] = "$wpdb->posts.post_status = 'future'";
- if ( in_array( 'inherit' , $q_status ) )
- $r_status[] = "$wpdb->posts.post_status = 'inherit'";
- if ( in_array( 'private', $q_status ) )
- $p_status[] = "$wpdb->posts.post_status = 'private'";
- if ( in_array( 'publish', $q_status ) )
- $r_status[] = "$wpdb->posts.post_status = 'publish'";
- if ( in_array( 'trash', $q_status ) )
- $r_status[] = "$wpdb->posts.post_status = 'trash'";
</del><ins>+ if ( $q['post_status'] == 'any' ) {
+ // @todo Use register_post_status() data to determine which states should be excluded.
+ $r_status[] = "$wpdb->posts.post_status <> 'trash'";
+ } else {
+ if ( in_array( 'draft' , $q_status ) )
+ $r_status[] = "$wpdb->posts.post_status = 'draft'";
+ if ( in_array( 'pending', $q_status ) )
+ $r_status[] = "$wpdb->posts.post_status = 'pending'";
+ if ( in_array( 'future' , $q_status ) )
+ $r_status[] = "$wpdb->posts.post_status = 'future'";
+ if ( in_array( 'inherit' , $q_status ) )
+ $r_status[] = "$wpdb->posts.post_status = 'inherit'";
+ if ( in_array( 'private', $q_status ) )
+ $p_status[] = "$wpdb->posts.post_status = 'private'";
+ if ( in_array( 'publish', $q_status ) )
+ $r_status[] = "$wpdb->posts.post_status = 'publish'";
+ if ( in_array( 'trash', $q_status ) )
+ $r_status[] = "$wpdb->posts.post_status = 'trash'";
+ }
</ins><span class="cx">
</span><span class="cx"> if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
</span><span class="cx"> $r_status = array_merge($r_status, $p_status);
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (12302 => 12303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2009-12-01 07:46:36 UTC (rev 12302)
+++ trunk/xmlrpc.php 2009-12-01 08:14:42 UTC (rev 12303)
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getPages');
</span><span class="cx">
</span><del>- $pages = get_posts( array('post_type' => 'page', 'post_status' => 'all', 'numberposts' => $num_pages) );
</del><ins>+ $pages = get_posts( array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages) );
</ins><span class="cx"> $num_pages = count($pages);
</span><span class="cx">
</span><span class="cx"> // If we have pages, put together their info.
</span></span></pre>
</div>
</div>
</body>
</html>