<!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>[16880] trunk/wp-includes/query.php: Don'
 t set query flags in parse_tax_query().</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16880">16880</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-11 15:20:52 +0000 (Sat, 11 Dec 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't set query flags in parse_tax_query(). See <a href="http://trac.wordpress.org/ticket/15487">#15487</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 (16879 => 16880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-12-11 09:40:49 UTC (rev 16879)
+++ trunk/wp-includes/query.php        2010-12-11 15:20:52 UTC (rev 16880)
</span><span class="lines">@@ -1355,8 +1355,25 @@
</span><span class="cx">                                 $this-&gt;is_date = true;
</span><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        $this-&gt;parse_tax_query( $qv );
</del><ins>+                        $tax_query_obj = $this-&gt;parse_tax_query( $qv );
</ins><span class="cx"> 
</span><ins>+                        foreach ( $tax_query_obj-&gt;queries as $tax_query ) {
+                                if ( 'IN' == $tax_query['operator'] ) {
+                                        switch ( $tax_query['taxonomy'] ) {
+                                                case 'category':
+                                                        $this-&gt;is_category = true;
+                                                        break;
+                                                case 'post_tag':
+                                                        $this-&gt;is_tag = true;
+                                                        break;
+                                                default:
+                                                        $this-&gt;is_tax = true;
+                                        }
+                                }
+                        }
+
+                        unset( $tax_query_obj, $tax_query );
+
</ins><span class="cx">                         _parse_meta_query( $qv );
</span><span class="cx"> 
</span><span class="cx">                         if ( empty($qv['author']) || ($qv['author'] == '0') ) {
</span><span class="lines">@@ -1471,7 +1488,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /*
</span><del>-         * Parses various taxonomy related query vars and sets the appropriate query flags.
</del><ins>+         * Parses various taxonomy related query vars.
</ins><span class="cx">          *
</span><span class="cx">          * @access protected
</span><span class="cx">          * @since 3.1.0
</span><span class="lines">@@ -1584,24 +1601,7 @@
</span><span class="cx">                         );
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                $tax_query_obj = new WP_Tax_Query( $tax_query );
-
-                foreach ( $tax_query_obj-&gt;queries as $query ) {
-                        if ( 'IN' == $query['operator'] ) {
-                                switch ( $query['taxonomy'] ) {
-                                        case 'category':
-                                                $this-&gt;is_category = true;
-                                                break;
-                                        case 'post_tag':
-                                                $this-&gt;is_tag = true;
-                                                break;
-                                        default:
-                                                $this-&gt;is_tax = true;
-                                }
-                        }
-                }
-
-                return $tax_query_obj;
</del><ins>+                return new WP_Tax_Query( $tax_query );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span></span></pre>
</div>
</div>

</body>
</html>