<!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>[25238] trunk: Convert `category__and` to `category__in` (less expensive) and unset it when only one category is passed.</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/25238">25238</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-04 18:16:31 +0000 (Wed, 04 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert `category__and` to `category__in` (less expensive) and unset it when only one category is passed. Adds unit tests.
Fixes <a href="http://core.trac.wordpress.org/ticket/24245">#24245</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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 (25237 => 25238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2013-09-04 17:49:16 UTC (rev 25237)
+++ trunk/src/wp-includes/query.php 2013-09-04 18:16:31 UTC (rev 25238)
</span><span class="lines">@@ -1762,8 +1762,16 @@
</span><span class="cx"> $q['cat'] = implode(',', $req_cats);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($q['category__in']) ) {
- $q['category__in'] = array_map('absint', array_unique( (array) $q['category__in'] ) );
</del><ins>+ if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
+ $q['category__and'] = (array) $q['category__and'];
+ if ( ! isset( $q['category__in'] ) )
+ $q['category__in'] = array();
+ $q['category__in'][] = absint( reset( $q['category__and'] ) );
+ unset( $q['category__and'] );
+ }
+
+ if ( ! empty( $q['category__in'] ) ) {
+ $q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
</ins><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__in'],
</span><span class="lines">@@ -1772,8 +1780,8 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($q['category__not_in']) ) {
- $q['category__not_in'] = array_map('absint', array_unique( (array) $q['category__not_in'] ) );
</del><ins>+ if ( ! empty($q['category__not_in']) ) {
+ $q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
</ins><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__not_in'],
</span><span class="lines">@@ -1782,8 +1790,8 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty($q['category__and']) ) {
- $q['category__and'] = array_map('absint', array_unique( (array) $q['category__and'] ) );
</del><ins>+ if ( ! empty($q['category__and']) ) {
+ $q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
</ins><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__and'],
</span></span></pre></div>
<a id="trunktestsphpunitteststermqueryphp"></a>
<div class="addfile"><h4>Added: trunk/tests/phpunit/tests/term/query.php (0 => 25238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term/query.php (rev 0)
+++ trunk/tests/phpunit/tests/term/query.php 2013-09-04 18:16:31 UTC (rev 25238)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<?php
+
+/**
+ * @group taxonomy
+ */
+class Tests_Tax_Query extends WP_UnitTestCase {
+ protected $q;
+
+ function setUp() {
+ parent::setUp();
+ unset( $this->q );
+ $this->q = new WP_Query();
+ }
+
+ function test_category__and_var() {
+ $term_id = $this->factory->category->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
+ $term_id2 = $this->factory->category->create( array( 'slug' => 'hoo', 'name' => 'HOO!' ) );
+ $post_id = $this->factory->post->create();
+
+ wp_set_post_categories( $post_id, $term_id );
+
+ $posts = $this->q->query( array( 'category__and' => array( $term_id ) ) );
+
+ $this->assertEmpty( $this->q->get( 'category__and' ) );
+ $this->assertCount( 0, $this->q->get( 'category__and' ) );
+ $this->assertNotEmpty( $this->q->get( 'category__in' ) );
+ $this->assertCount( 1, $this->q->get( 'category__in' ) );
+
+ $this->assertNotEmpty( $posts );
+ $this->assertEquals( array( $post_id ), wp_list_pluck( $posts, 'ID' ) );
+
+ $posts2 = $this->q->query( array( 'category__and' => array( $term_id, $term_id2 ) ) );
+ $this->assertNotEmpty( $this->q->get( 'category__and' ) );
+ $this->assertCount( 2, $this->q->get( 'category__and' ) );
+ $this->assertEmpty( $this->q->get( 'category__in' ) );
+ $this->assertCount( 0, $this->q->get( 'category__in' ) );
+
+ $this->assertEmpty( $posts2 );
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>