<!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>[16467] trunk/wp-includes/taxonomy.php:
Exclude term exclusions even if they are also inclusions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16467">16467</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-11-18 19:04:47 +0000 (Thu, 18 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Exclude term exclusions even if they are also inclusions. props foofy, scribu. 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 (16466 => 16467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-18 18:46:41 UTC (rev 16466)
+++ trunk/wp-includes/taxonomy.php 2010-11-18 19:04:47 UTC (rev 16467)
</span><span class="lines">@@ -542,9 +542,6 @@
</span><span class="cx"> return ' AND 0 = 1';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !in_array( $operator, array( 'IN', 'NOT IN' ) ) )
- $operator = 'IN';
-
</del><span class="cx"> $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
</span><span class="cx">
</span><span class="cx"> $terms = array_unique( (array) $terms );
</span><span class="lines">@@ -587,16 +584,14 @@
</span><span class="cx">
</span><span class="cx"> $i++;
</span><span class="cx"> }
</span><del>- else {
- // NOT IN is very slow for some reason
- $where .= " AND $primary_table.$primary_id_column IN (
- SELECT object_id
- FROM $wpdb->term_relationships
- WHERE term_taxonomy_id $operator ($terms)
</del><ins>+ elseif ( 'NOT IN' == $operator ) {
+ $where .= " AND $primary_table.$primary_id_column NOT IN (
+ SELECT object_id
+ FROM $wpdb->term_relationships
+ WHERE term_taxonomy_id IN ($terms)
</ins><span class="cx"> )";
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return compact( 'join', 'where' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>