<!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>[17553] branches/3.1/wp-includes/query.php:
Parse the meta query again if query vars change.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17553">17553</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-03-24 16:08:02 +0000 (Thu, 24 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Parse the meta query again if query vars change. Set a global query_vars_changed flag instead of doing multiple hash creation calls. Props greuben. see <a href="http://trac.wordpress.org/ticket/16742">#16742</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 (17552 => 17553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/query.php 2011-03-24 16:07:24 UTC (rev 17552)
+++ branches/3.1/wp-includes/query.php 2011-03-24 16:08:02 UTC (rev 17553)
</span><span class="lines">@@ -1240,6 +1240,15 @@
</span><span class="cx"> var $query_vars_hash = false;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made
+ * via pre_get_posts hooks.
+ *
+ * @since 3.1.1
+ * @access private
+ */
+ var $query_vars_changed = true;
+
+ /**
</ins><span class="cx"> * Resets query flags to false.
</span><span class="cx"> *
</span><span class="cx"> * The query flags are what page info WordPress was able to figure out.
</span><span class="lines">@@ -1395,6 +1404,7 @@
</span><span class="cx">
</span><span class="cx"> $this->query_vars = $this->fill_query_vars($this->query_vars);
</span><span class="cx"> $qv = &$this->query_vars;
</span><ins>+ $this->query_vars_changed = true;
</ins><span class="cx">
</span><span class="cx"> if ( ! empty($qv['robots']) )
</span><span class="cx"> $this->is_robots = true;
</span><span class="lines">@@ -1627,6 +1637,9 @@
</span><span class="cx"> if ( '404' == $qv['error'] )
</span><span class="cx"> $this->set_404();
</span><span class="cx">
</span><ins>+ $this->query_vars_hash = md5( serialize( $this->query_vars ) );
+ $this->query_vars_changed = false;
+
</ins><span class="cx"> do_action_ref_array('parse_query', array(&$this));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1685,7 +1698,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 && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
</del><ins>+ if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
</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">@@ -1739,7 +1752,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Tag stuff
</span><del>- if ( '' != $q['tag'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
</del><ins>+ if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
</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">@@ -1811,8 +1824,6 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->query_vars_hash = md5(serialize( $this->query_vars ) );
-
</del><span class="cx"> $this->tax_query = new WP_Tax_Query( $tax_query );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1882,8 +1893,17 @@
</span><span class="cx"> // Shorthand.
</span><span class="cx"> $q = &$this->query_vars;
</span><span class="cx">
</span><ins>+ // Fill again in case pre_get_posts unset some vars.
</ins><span class="cx"> $q = $this->fill_query_vars($q);
</span><span class="cx">
</span><ins>+ // Set a flag if a pre_get_posts hook changed the query vars.
+ $hash = md5( serialize( $this->query_vars ) );
+ if ( $hash != $this->query_vars_hash ) {
+ $this->query_vars_changed = true;
+ $this->query_vars_hash = $hash;
+ }
+ unset($hash);
+
</ins><span class="cx"> // First let's clear some variables
</span><span class="cx"> $distinct = '';
</span><span class="cx"> $whichauthor = '';
</span><span class="lines">@@ -2444,6 +2464,16 @@
</span><span class="cx"> $where .= ')';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Parse the meta query again if query vars have changed.
+ if ( $this->query_vars_changed ) {
+ $meta_query_hash = md5( serialize( $q['meta_query'] ) );
+ $_meta_query = $q['meta_query'];
+ unset( $q['meta_query'] );
+ _parse_meta_query( $q );
+ if ( md5( serialize( $q['meta_query'] ) ) != $meta_query_hash && is_array( $_meta_query ) )
+ $q['meta_query'] = array_merge( $_meta_query, $q['meta_query'] );
+ }
+
</ins><span class="cx"> if ( !empty( $q['meta_query'] ) ) {
</span><span class="cx"> $clauses = call_user_func_array( '_get_meta_sql', array( $q['meta_query'], 'post', $wpdb->posts, 'ID', &$this) );
</span><span class="cx"> $join .= $clauses['join'];
</span></span></pre>
</div>
</div>
</body>
</html>