<!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>[16555] trunk/wp-includes/taxonomy.php: Introduce 'relation'
operator between tax queries.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16555">16555</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-23 20:22:27 +0000 (Tue, 23 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce 'relation' operator between tax queries. Props Otto42 for initial patch. See <a href="http://trac.wordpress.org/ticket/12891">#12891</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16554 => 16555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-23 20:20:44 UTC (rev 16554)
+++ trunk/wp-includes/taxonomy.php 2010-11-23 20:22:27 UTC (rev 16555)
</span><span class="lines">@@ -524,9 +524,19 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $join = '';
</span><del>- $where = '';
</del><ins>+ $where = array();
</ins><span class="cx"> $i = 0;
</span><ins>+
+ if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
+ $relation = 'OR';
+ } else {
+ $relation = 'AND';
+ }
+
</ins><span class="cx"> foreach ( $tax_query as $query ) {
</span><ins>+ if ( ! is_array( $query ) )
+ continue;
+
</ins><span class="cx"> extract( wp_parse_args( $query, array(
</span><span class="cx"> 'taxonomy' => array(),
</span><span class="cx"> 'terms' => array(),
</span><span class="lines">@@ -566,9 +576,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'IN' == $operator ) {
</span><del>- if ( empty( $terms ) )
- return array( 'join' => '', 'where' => ' AND 0 = 1');
</del><span class="cx">
</span><ins>+ if ( empty( $terms ) ) {
+ if ( 'OR' == $relation )
+ continue;
+ else
+ return array( 'join' => '', 'where' => ' AND 0 = 1' );
+ }
+
</ins><span class="cx"> $terms = implode( ',', $terms );
</span><span class="cx">
</span><span class="cx"> $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
</span><span class="lines">@@ -577,24 +592,30 @@
</span><span class="cx"> $join .= $i ? " AS $alias" : '';
</span><span class="cx"> $join .= " ON ($primary_table.$primary_id_column = $alias.object_id)";
</span><span class="cx">
</span><del>- $where .= " AND $alias.term_taxonomy_id $operator ($terms)";
-
- $i++;
</del><ins>+ $where[] = "$alias.term_taxonomy_id $operator ($terms)";
</ins><span class="cx"> }
</span><span class="cx"> elseif ( 'NOT IN' == $operator ) {
</span><ins>+
</ins><span class="cx"> if ( empty( $terms ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $terms = implode( ',', $terms );
</span><span class="cx">
</span><del>- $where .= " AND $primary_table.$primary_id_column NOT IN (
- SELECT object_id
- FROM $wpdb->term_relationships
</del><ins>+ $where[] = "$primary_table.$primary_id_column NOT IN (
+ SELECT object_id
+ FROM $wpdb->term_relationships
</ins><span class="cx"> WHERE term_taxonomy_id IN ($terms)
</span><span class="cx"> )";
</span><span class="cx"> }
</span><ins>+
+ $i++;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !empty( $where ) )
+ $where = ' AND ( ' . implode( " $relation ", $where ) . ' )';
+ else
+ $where = '';
+
</ins><span class="cx"> return compact( 'join', 'where' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>