<!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>[28664] trunk: After [28613], also kill queries that explicityly pass empty arrays to `category__in`, `tag__in`, `tag_slug__in`, and `author__in` to `WP_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/28664">28664</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-04 17:49:26 +0000 (Wed, 04 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>After <a href="http://core.trac.wordpress.org/changeset/28613">[28613]</a>, also kill queries that explicityly pass empty arrays to `category__in`, `tag__in`, `tag_slug__in`, and `author__in` to `WP_Query`.
Adds unit tests.
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>
<li><a href="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.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 (28663 => 28664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2014-06-04 17:33:42 UTC (rev 28663)
+++ trunk/src/wp-includes/query.php 2014-06-04 17:49:26 UTC (rev 28664)
</span><span class="lines">@@ -1830,6 +1830,8 @@
</span><span class="cx"> 'field' => 'term_id',
</span><span class="cx"> 'include_children' => false
</span><span class="cx"> );
</span><ins>+ } elseif ( isset( $this->query['category__in'] ) ) {
+ $q['category__in'] = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty($q['category__not_in']) ) {
</span><span class="lines">@@ -1887,6 +1889,8 @@
</span><span class="cx"> 'taxonomy' => 'post_tag',
</span><span class="cx"> 'terms' => $q['tag__in']
</span><span class="cx"> );
</span><ins>+ } elseif ( isset( $this->query['tag__in'] ) ) {
+ $q['tag__in'] = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['tag__not_in']) ) {
</span><span class="lines">@@ -1914,6 +1918,8 @@
</span><span class="cx"> 'terms' => $q['tag_slug__in'],
</span><span class="cx"> 'field' => 'slug'
</span><span class="cx"> );
</span><ins>+ } elseif ( isset( $this->query['tag_slug__in'] ) ) {
+ $q['tag_slug__in'] = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['tag_slug__and']) ) {
</span><span class="lines">@@ -2500,6 +2506,13 @@
</span><span class="cx"> $where .= $clauses['where'];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If *__in is passed to WP_Query as an empty array, don't return results
+ foreach ( array( 'category', 'tag', 'tag_slug' ) as $in ) {
+ if ( isset( $q["{$in}__in"] ) && false === $q["{$in}__in"] ) {
+ $where = " AND 1=0 $where";
+ }
+ }
+
</ins><span class="cx"> if ( $this->is_tax ) {
</span><span class="cx"> if ( empty($post_type) ) {
</span><span class="cx"> // Do a fully inclusive search for currently registered post types of queried taxonomies
</span><span class="lines">@@ -2591,6 +2604,9 @@
</span><span class="cx"> } elseif ( ! empty( $q['author__in'] ) ) {
</span><span class="cx"> $author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
</span><span class="cx"> $where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
</span><ins>+ } elseif ( isset( $this->query['author__in'] ) ) {
+ $author__in = 0;
+ $where .= ' AND 1=0 ';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Author stuff for nice URLs
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/results.php (28663 => 28664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/results.php 2014-06-04 17:33:42 UTC (rev 28663)
+++ trunk/tests/phpunit/tests/query/results.php 2014-06-04 17:49:26 UTC (rev 28664)
</span><span class="lines">@@ -513,6 +513,9 @@
</span><span class="cx"> $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
</span><span class="cx"> $this->assertEqualSets( array( $author_1, $author_2 ), $author_ids );
</span><span class="cx">
</span><ins>+ $posts = $this->q->query( array( 'author__in' => array() ) );
+ $this->assertEmpty( $posts );
+
</ins><span class="cx"> $posts = $this->q->query( array(
</span><span class="cx"> 'author__not_in' => array( $author_1, $author_2 ),
</span><span class="cx"> 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
</span></span></pre></div>
<a id="trunktestsphpunitteststermqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term/query.php (28663 => 28664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term/query.php 2014-06-04 17:33:42 UTC (rev 28663)
+++ trunk/tests/phpunit/tests/term/query.php 2014-06-04 17:49:26 UTC (rev 28664)
</span><span class="lines">@@ -202,4 +202,30 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( array( $posts[0], $posts[3] ), $results2, 'Relation: AND; Operator: IN' );
</span><span class="cx"> }
</span><ins>+
+ function test_empty__in() {
+ $cat_id = $this->factory->category->create();
+ $post_id = $this->factory->post->create();
+ wp_set_post_categories( $post_id, $cat_id );
+
+ $q1 = get_posts( array( 'category__in' => array( $cat_id ) ) );
+ $this->assertNotEmpty( $q1 );
+ $q2 = get_posts( array( 'category__in' => array() ) );
+ $this->assertEmpty( $q2 );
+
+ $tag = wp_insert_term( 'woo', 'post_tag' );
+ $tag_id = $tag['term_id'];
+ $slug = get_tag( $tag_id )->slug;
+ wp_set_post_tags( $post_id, $slug );
+
+ $q3 = get_posts( array( 'tag__in' => array( $tag_id ) ) );
+ $this->assertNotEmpty( $q3 );
+ $q4 = get_posts( array( 'tag__in' => array() ) );
+ $this->assertEmpty( $q4 );
+
+ $q5 = get_posts( array( 'tag_slug__in' => array( $slug ) ) );
+ $this->assertNotEmpty( $q5 );
+ $q6 = get_posts( array( 'tag_slug__in' => array() ) );
+ $this->assertEmpty( $q6 );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>