<!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>[17490] branches/3.1/wp-includes/query.php:
Reparse the taxonomy query if query vars change.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17490">17490</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2011-03-02 04:10:53 +0000 (Wed, 02 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reparse the taxonomy query if query vars change. fixes <a href="http://trac.wordpress.org/ticket/16622">#16622</a> for 3.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludesqueryphp">branches/3.1/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/query.php (17489 => 17490)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/query.php 2011-03-02 04:10:21 UTC (rev 17489)
+++ branches/3.1/wp-includes/query.php 2011-03-02 04:10:53 UTC (rev 17490)
</span><span class="lines">@@ -1231,13 +1231,13 @@
</span><span class="cx"> var $is_post_type_archive = false;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Whether the tax query has been parsed once.
</del><ins>+ * Stores the ->query_vars state like md5(serialize( $this->query_vars ) ) so we know
+ * whether we have to re-parse because something has changed
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access private
</span><del>- * @var bool
</del><span class="cx"> */
</span><del>- var $parsed_tax_query = false;
</del><ins>+ var $query_vars_hash = false;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Resets query flags to false.
</span><span class="lines">@@ -1496,7 +1496,7 @@
</span><span class="cx"> $this->is_date = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->parsed_tax_query = false;
</del><ins>+ $this->query_vars_hash = false;
</ins><span class="cx"> $this->parse_tax_query( $qv );
</span><span class="cx">
</span><span class="cx"> foreach ( $this->tax_query->queries as $tax_query ) {
</span><span class="lines">@@ -1682,7 +1682,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Category stuff
</span><del>- if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query ) {
</del><ins>+ if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
</ins><span class="cx"> $q['cat'] = ''.urldecode($q['cat']).'';
</span><span class="cx"> $q['cat'] = addslashes_gpc($q['cat']);
</span><span class="cx"> $cat_array = preg_split('/[,\s]+/', $q['cat']);
</span><span class="lines">@@ -1736,7 +1736,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Tag stuff
</span><del>- if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query ) {
</del><ins>+ if ( '' != $q['tag'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
</ins><span class="cx"> if ( strpos($q['tag'], ',') !== false ) {
</span><span class="cx"> $tags = preg_split('/[,\s]+/', $q['tag']);
</span><span class="cx"> foreach ( (array) $tags as $tag ) {
</span><span class="lines">@@ -1808,7 +1808,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->parsed_tax_query = true;
</del><ins>+ $this->query_vars_hash = md5(serialize( $this->query_vars ) );
</ins><span class="cx">
</span><span class="cx"> $this->tax_query = new WP_Tax_Query( $tax_query );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>