<!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>[16893] trunk/wp-includes/query.php: Always call WP_Tax_Query::get_sql().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16893">16893</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-13 15:11:02 +0000 (Mon, 13 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always call WP_Tax_Query::get_sql(). Fixes <a href="http://trac.wordpress.org/ticket/15797">#15797</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 (16892 => 16893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-12-13 12:08:27 UTC (rev 16892)
+++ trunk/wp-includes/query.php 2010-12-13 15:11:02 UTC (rev 16893)
</span><span class="lines">@@ -1356,6 +1356,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->parse_tax_query( $qv );
</span><ins>+
</ins><span class="cx"> foreach ( $this->tax_query->queries as $tax_query ) {
</span><span class="cx"> if ( 'IN' == $tax_query['operator'] ) {
</span><span class="cx"> switch ( $tax_query['taxonomy'] ) {
</span><span class="lines">@@ -1935,22 +1936,22 @@
</span><span class="cx"> // Taxonomies
</span><span class="cx"> $this->parse_tax_query( $q );
</span><span class="cx">
</span><del>- if ( $this->is_category || $this->is_tag || $this->is_tax ) {
- $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
</del><ins>+ $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
</ins><span class="cx">
</span><del>- $join .= $clauses['join'];
- $where .= $clauses['where'];
</del><ins>+ $join .= $clauses['join'];
+ $where .= $clauses['where'];
</ins><span class="cx">
</span><del>- if ( $this->is_tax ) {
- if ( empty($post_type) ) {
- $post_type = 'any';
- $post_status_join = true;
- } elseif ( in_array('attachment', (array) $post_type) ) {
- $post_status_join = true;
- }
</del><ins>+ if ( $this->is_tax ) {
+ if ( empty($post_type) ) {
+ $post_type = 'any';
+ $post_status_join = true;
+ } elseif ( in_array('attachment', (array) $post_type) ) {
+ $post_status_join = true;
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- // Back-compat
</del><ins>+ // Back-compat
+ if ( $this->is_category || $this->is_tag || $this->is_tax ) {
</ins><span class="cx"> $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
</span><span class="cx"> if ( !empty( $tax_query_in ) ) {
</span><span class="cx"> if ( !isset( $q['taxonomy'] ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>