<!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>[17244] trunk/wp-includes: category__and, tag__and, tag_slug__in,
tag_slug__and support.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17244">17244</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-01-09 16:19:48 +0000 (Sun, 09 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>category__and, tag__and, tag_slug__in, tag_slug__and support. fixes <a href="http://trac.wordpress.org/ticket/16157">#16157</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.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 (17243 => 17244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-01-08 17:21:49 UTC (rev 17243)
+++ trunk/wp-includes/query.php 2011-01-09 16:19:48 UTC (rev 17244)
</span><span class="lines">@@ -1692,7 +1692,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['category__in']) ) {
</span><del>- $q['category__in'] = array_unique( $q['category__in'] );
</del><ins>+ $q['category__in'] = array_map('absint', array_unique( $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">@@ -1701,37 +1701,78 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['category__not_in']) ) {
</span><del>- $q['category__not_in'] = array_unique( $q['category__not_in'] );
</del><ins>+ $q['category__not_in'] = array_map('absint', array_unique( $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><del>- 'operator' => 'NOT IN',
</del><ins>+ 'operator' => 'NOT IN'
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !empty($q['category__and']) ) {
+ $q['category__and'] = array_map('absint', array_unique( $q['category__and'] ) );
+ $tax_query[] = array(
+ 'taxonomy' => 'category',
+ 'terms' => $q['category__and'],
+ 'field' => 'term_id',
+ 'operator' => 'AND'
+ );
+ }
+
</ins><span class="cx"> // Tag stuff
</span><span class="cx"> if ( !empty($q['tag_id']) ) {
</span><ins>+ $q['tag_id'] = absint( $q['tag_id'] );
</ins><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'post_tag',
</span><del>- 'terms' => $q['tag_id'],
</del><ins>+ 'terms' => $q['tag_id']
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['tag__in']) ) {
</span><ins>+ $q['tag__in'] = array_map('absint', array_unique( $q['tag__in'] ) );
</ins><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'post_tag',
</span><del>- 'terms' => $q['tag__in'],
</del><ins>+ 'terms' => $q['tag__in']
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['tag__not_in']) ) {
</span><ins>+ $q['tag__not_in'] = array_map('absint', array_unique( $q['tag__not_in'] ) );
</ins><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'post_tag',
</span><span class="cx"> 'terms' => $q['tag__not_in'],
</span><del>- 'operator' => 'NOT IN',
</del><ins>+ 'operator' => 'NOT IN'
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !empty($q['tag__and']) ) {
+ $q['tag__and'] = array_map('absint', array_unique( $q['tag__and'] ) );
+ $tax_query[] = array(
+ 'taxonomy' => 'post_tag',
+ 'terms' => $q['tag__and'],
+ 'operator' => 'AND'
+ );
+ }
+
+ if ( !empty($q['tag_slug__in']) ) {
+ $q['tag_slug__in'] = array_map('sanitize_title', $q['tag_slug__in']);
+ $tax_query[] = array(
+ 'taxonomy' => 'post_tag',
+ 'terms' => $q['tag_slug__in'],
+ 'field' => 'slug'
+ );
+ }
+
+ if ( !empty($q['tag_slug__and']) ) {
+ $q['tag_slug__and'] = array_map('sanitize_title', $q['tag_slug__and']);
+ $tax_query[] = array(
+ 'taxonomy' => 'post_tag',
+ 'terms' => $q['tag_slug__and'],
+ 'field' => 'slug',
+ 'operator' => 'AND'
+ );
+ }
+
</ins><span class="cx"> $this->tax_query = new WP_Tax_Query( $tax_query );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (17243 => 17244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-01-08 17:21:49 UTC (rev 17243)
+++ trunk/wp-includes/taxonomy.php 2011-01-09 16:19:48 UTC (rev 17244)
</span><span class="lines">@@ -671,8 +671,7 @@
</span><span class="cx"> $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
</span><span class="cx">
</span><span class="cx"> $where[] = "$alias.term_taxonomy_id $operator ($terms)";
</span><del>- }
- elseif ( 'NOT IN' == $operator ) {
</del><ins>+ } elseif ( 'NOT IN' == $operator ) {
</ins><span class="cx">
</span><span class="cx"> if ( empty( $terms ) )
</span><span class="cx"> continue;
</span><span class="lines">@@ -684,6 +683,21 @@
</span><span class="cx"> FROM $wpdb->term_relationships
</span><span class="cx"> WHERE term_taxonomy_id IN ($terms)
</span><span class="cx"> )";
</span><ins>+ } elseif ( 'AND' == $operator ) {
+
+ if ( empty( $terms ) )
+ continue;
+
+ $num_terms = count( $terms );
+
+ $terms = implode( ',', $terms );
+
+ $where[] = "$primary_table.$primary_id_column IN (
+ SELECT object_id
+ FROM $wpdb->term_relationships
+ WHERE term_taxonomy_id IN ($terms)
+ GROUP BY object_id HAVING COUNT(object_id) = $num_terms
+ )";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $i++;
</span></span></pre>
</div>
</div>
</body>
</html>