<!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>[16402] trunk/wp-includes: Don't pollute the 'tax_query' query var.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16402">16402</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-16 16:22:09 +0000 (Tue, 16 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't pollute the 'tax_query' query var. 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 (16401 => 16402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-16 16:09:46 UTC (rev 16401)
+++ trunk/wp-includes/query.php 2010-11-16 16:22:09 UTC (rev 16402)
</span><span class="lines">@@ -1931,8 +1931,9 @@
</span><span class="cx"> $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
</span><span class="cx">
</span><span class="cx"> // Taxonomies
</span><del>- $q['tax_query'] = $this->parse_tax_query( $q );
- if ( !empty( $q['tax_query'] ) ) {
</del><ins>+ $tax_query = $this->parse_tax_query( $q );
+
+ if ( !empty( $tax_query ) ) {
</ins><span class="cx"> if ( empty($post_type) ) {
</span><span class="cx"> $post_type = 'any';
</span><span class="cx"> $post_status_join = true;
</span><span class="lines">@@ -1940,10 +1941,10 @@
</span><span class="cx"> $post_status_join = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
</del><ins>+ $where .= get_tax_sql( $tax_query, "$wpdb->posts.ID" );
</ins><span class="cx">
</span><span class="cx"> // Back-compat
</span><del>- $tax_query_in = wp_list_filter( $q['tax_query'], array( 'operator' => 'IN' ) );
</del><ins>+ $tax_query_in = wp_list_filter( $tax_query, array( 'operator' => 'IN' ) );
</ins><span class="cx"> if ( !empty( $tax_query_in ) ) {
</span><span class="cx"> if ( !isset( $q['taxonomy'] ) ) {
</span><span class="cx"> foreach ( $tax_query_in as $a_tax_query ) {
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16401 => 16402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-16 16:09:46 UTC (rev 16401)
+++ trunk/wp-includes/taxonomy.php 2010-11-16 16:22:09 UTC (rev 16402)
</span><span class="lines">@@ -593,17 +593,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 1 == count( $sql ) ) {
</span><del>- $ids = $wpdb->get_col( $sql[0] );
</del><ins>+ $r = $wpdb->get_col( $sql[0] );
</ins><span class="cx"> } else {
</span><span class="cx"> $r = "SELECT object_id FROM $wpdb->term_relationships WHERE 1=1";
</span><span class="cx"> foreach ( $sql as $query )
</span><span class="cx"> $r .= " AND object_id IN ($query)";
</span><del>-
- $ids = $wpdb->get_col( $r );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $ids ) )
</span><del>- return " AND $object_id_column IN(" . implode( ', ', $ids ) . ")";
</del><ins>+ return " AND $object_id_column IN($r)";
</ins><span class="cx"> else
</span><span class="cx"> return ' AND 0 = 1';
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>