<!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>[16380] trunk/wp-includes/query.php:
Re-parse tax query just before calling get_tax_sql().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16380">16380</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-15 10:11:25 +0000 (Mon, 15 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-parse tax query just before calling get_tax_sql(). Fixes <a href="http://trac.wordpress.org/ticket/15161">#15161</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.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 (16379 => 16380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-15 10:02:39 UTC (rev 16379)
+++ trunk/wp-includes/query.php 2010-11-15 10:11:25 UTC (rev 16380)
</span><span class="lines">@@ -1461,12 +1461,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Populates the 'tax_query' property
</del><ins>+ * Parses various taxonomy related query vars and sets the appropriate query flags
</ins><span class="cx"> *
</span><span class="cx"> * @access protected
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param array &$q The query variables
</span><ins>+ * @return array tax query
</ins><span class="cx"> */
</span><span class="cx"> function parse_tax_query( &$q ) {
</span><span class="cx"> if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
</span><span class="lines">@@ -1580,9 +1581,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $q['tax_query'] = $tax_query;
-
- foreach ( $q['tax_query'] as $query ) {
</del><ins>+ foreach ( $tax_query as $query ) {
</ins><span class="cx"> if ( 'IN' == $query['operator'] ) {
</span><span class="cx"> switch ( $query['taxonomy'] ) {
</span><span class="cx"> case 'category':
</span><span class="lines">@@ -1596,6 +1595,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ return $tax_query;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1930,6 +1931,7 @@
</span><span class="cx"> $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
</span><span class="cx">
</span><span class="cx"> // Taxonomies
</span><ins>+ $q['tax_query'] = $this->parse_tax_query( $q );
</ins><span class="cx"> if ( !empty( $q['tax_query'] ) ) {
</span><span class="cx"> if ( empty($post_type) ) {
</span><span class="cx"> $post_type = 'any';
</span><span class="lines">@@ -1941,7 +1943,7 @@
</span><span class="cx"> $where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
</span><span class="cx">
</span><span class="cx"> // Back-compat
</span><del>- $cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category' ) );
</del><ins>+ $cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category', 'operator' => 'IN' ) );
</ins><span class="cx"> if ( !empty( $cat_query ) ) {
</span><span class="cx"> $cat_query = reset( $cat_query );
</span><span class="cx"> $cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );
</span></span></pre>
</div>
</div>
</body>
</html>