Changeset 17552

Timestamp:

03/24/2011 04:07:24 PM (14 years ago)

Author:

ryan

Message:

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 #16742 for trunk

File:

• trunk/wp-includes/query.php (modified) (8 diffs)

trunk/wp-includes/query.php

@@ -1239 +1239 @@
      */
     var $query_vars_hash = false;
+
+    /**
+     * 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;
 
     /**
@@ -1396 +1405 @@
         $this->query_vars = $this->fill_query_vars($this->query_vars);
         $qv = &$this->query_vars;
+        $this->query_vars_changed = true;
 
         if ( ! empty($qv['robots']) )
@@ -1628 +1638 @@
             $this->set_404();
 
+        $this->query_vars_hash = md5( serialize( $this->query_vars ) );
+        $this->query_vars_changed = false;
+
         do_action_ref_array('parse_query', array(&$this));
     }
@@ -1686 +1699 @@
 
         // Category stuff
-        if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
+        if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
             $q['cat'] = ''.urldecode($q['cat']).'';
             $q['cat'] = addslashes_gpc($q['cat']);
@@ -1740 +1753 @@
 
         // Tag stuff
-        if ( '' != $q['tag'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
+        if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
             if ( strpos($q['tag'], ',') !== false ) {
                 $tags = preg_split('/[,\s]+/', $q['tag']);
@@ -1812 +1825 @@
         }
 
-        $this->query_vars_hash = md5(serialize( $this->query_vars ) );
-
         $this->tax_query = new WP_Tax_Query( $tax_query );
     }
@@ -1883 +1894 @@
         $q = &$this->query_vars;
 
+        // Fill again in case pre_get_posts unset some vars.
         $q = $this->fill_query_vars($q);
+
+        // 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);
 
         // First let's clear some variables
@@ -2443 +2463 @@
 
             $where .= ')';
+        }
+
+        // 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'] );
         }