<!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" />
<title>[28613] trunk: If `post__in` or `post_parent__in` is passed to `WP_Query` as an empty array, nuke the query.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28613">28613</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-29 06:03:15 +0000 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>If `post__in` or `post_parent__in` is passed to `WP_Query` as an empty array, nuke the query. Both vars are currently only checked for truthiness after which they are ignored. Setting these vars at all indicates explicit filtering being desired.
Adds unit test.
Fixes <a href="http://core.trac.wordpress.org/ticket/28099">#28099</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (28612 => 28613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2014-05-29 05:47:35 UTC (rev 28612)
+++ trunk/src/wp-includes/query.php 2014-05-29 06:03:15 UTC (rev 28613)
</span><span class="lines">@@ -2448,6 +2448,9 @@
</span><span class="cx"> } elseif ( $q['post__in'] ) {
</span><span class="cx"> $post__in = implode(',', array_map( 'absint', $q['post__in'] ));
</span><span class="cx"> $where .= " AND {$wpdb->posts}.ID IN ($post__in)";
</span><ins>+ } elseif ( isset( $this->query['post__in'] ) ) {
+ $post__in = 0;
+ $where .= " AND 1=0 ";
</ins><span class="cx"> } elseif ( $q['post__not_in'] ) {
</span><span class="cx"> $post__not_in = implode(',', array_map( 'absint', $q['post__not_in'] ));
</span><span class="cx"> $where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
</span><span class="lines">@@ -2458,6 +2461,9 @@
</span><span class="cx"> } elseif ( $q['post_parent__in'] ) {
</span><span class="cx"> $post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
</span><span class="cx"> $where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
</span><ins>+ } elseif ( isset( $this->query['post_parent__in'] ) ) {
+ $post_parent__in = 0;
+ $where .= " AND 1=0 ";
</ins><span class="cx"> } elseif ( $q['post_parent__not_in'] ) {
</span><span class="cx"> $post_parent__not_in = implode( ',', array_map( 'absint', $q['post_parent__not_in'] ) );
</span><span class="cx"> $where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/results.php (28612 => 28613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/results.php 2014-05-29 05:47:35 UTC (rev 28612)
+++ trunk/tests/phpunit/tests/query/results.php 2014-05-29 06:03:15 UTC (rev 28613)
</span><span class="lines">@@ -402,6 +402,15 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function test_empty_post__in() {
+ $posts1 = $this->q->query( array() );
+ $this->assertNotEmpty( $posts1 );
+ $posts2 = $this->q->query( array( 'post__in' => array() ) );
+ $this->assertEmpty( $posts2 );
+ $posts3 = $this->q->query( array( 'post_parent__in' => array() ) );
+ $this->assertEmpty( $posts3 );
+ }
+
</ins><span class="cx"> function test_exlude_from_search_empty() {
</span><span class="cx"> global $wp_post_types;
</span><span class="cx"> foreach ( array_keys( $wp_post_types ) as $slug )
</span></span></pre>
</div>
</div>
</body>
</html>