<!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>[16512] trunk/wp-includes: Fix logic for when excluding a non-existant term
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16512">16512</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-20 21:28:50 +0000 (Sat, 20 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix logic for when excluding a non-existant term. See <a href="http://trac.wordpress.org/ticket/12891">#12891</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 (16511 => 16512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-20 21:10:20 UTC (rev 16511)
+++ trunk/wp-includes/query.php 2010-11-20 21:28:50 UTC (rev 16512)
</span><span class="lines">@@ -1947,12 +1947,8 @@
</span><span class="cx"> if ( !empty( $this->tax_query ) ) {
</span><span class="cx"> $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
</span><span class="cx">
</span><del>- if ( empty($clauses['join']) && empty($clauses['where']) ) {
- $where .= ' AND 0 = 1';
- } else {
- $join .= $clauses['join'];
- $where .= $clauses['where'];
- }
</del><ins>+ $join .= $clauses['join'];
+ $where .= $clauses['where'];
</ins><span class="cx">
</span><span class="cx"> if ( $this->is_tax ) {
</span><span class="cx"> if ( empty($post_type) ) {
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16511 => 16512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-20 21:10:20 UTC (rev 16511)
+++ trunk/wp-includes/taxonomy.php 2010-11-20 21:28:50 UTC (rev 16512)
</span><span class="lines">@@ -552,9 +552,6 @@
</span><span class="cx"> if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
</span><span class="cx"> _transform_terms( $terms, $taxonomies, $field, 'term_id' );
</span><span class="cx">
</span><del>- if ( empty( $terms ) )
- continue;
-
</del><span class="cx"> $children = array();
</span><span class="cx"> foreach ( $terms as $term ) {
</span><span class="cx"> $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
</span><span class="lines">@@ -568,12 +565,12 @@
</span><span class="cx"> _transform_terms( $terms, $taxonomies, $field, 'term_taxonomy_id' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $terms ) )
- continue;
</del><ins>+ if ( 'IN' == $operator ) {
+ if ( empty( $terms ) )
+ return array( 'join' => '', 'where' => ' AND 0 = 1');
</ins><span class="cx">
</span><del>- $terms = implode( ',', $terms );
</del><ins>+ $terms = implode( ',', $terms );
</ins><span class="cx">
</span><del>- if ( 'IN' == $operator ) {
</del><span class="cx"> $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
</span><span class="cx">
</span><span class="cx"> $join .= " INNER JOIN $wpdb->term_relationships";
</span><span class="lines">@@ -585,6 +582,11 @@
</span><span class="cx"> $i++;
</span><span class="cx"> }
</span><span class="cx"> elseif ( 'NOT IN' == $operator ) {
</span><ins>+ if ( empty( $terms ) )
+ continue;
+
+ $terms = implode( ',', $terms );
+
</ins><span class="cx"> $where .= " AND $primary_table.$primary_id_column NOT IN (
</span><span class="cx"> SELECT object_id
</span><span class="cx"> FROM $wpdb->term_relationships
</span><span class="lines">@@ -599,6 +601,9 @@
</span><span class="cx"> function _transform_terms( &$terms, $taxonomies, $field, $resulting_field ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><ins>+ if ( empty( $terms ) )
+ return;
+
</ins><span class="cx"> if ( $field == $resulting_field )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>