Changeset 17490 for branches/3.1/wp-includes/query.php

Timestamp:

03/02/2011 04:10:53 AM (14 years ago)

Author:

markjaquith

Message:

Reparse the taxonomy query if query vars change. fixes #16622 for 3.1

File:

• branches/3.1/wp-includes/query.php (modified) (5 diffs)

branches/3.1/wp-includes/query.php

@@ -1232 +1232 @@
 
     /**
-     * Whether the tax query has been parsed once.
+     * Stores the ->query_vars state like md5(serialize( $this->query_vars ) ) so we know
+     * whether we have to re-parse because something has changed
      *
      * @since 3.1.0
      * @access private
-     * @var bool
-     */
-    var $parsed_tax_query = false;
+     */
+    var $query_vars_hash = false;
 
     /**
@@ -1497 +1497 @@
             }
 
-            $this->parsed_tax_query = false;
+            $this->query_vars_hash = false;
             $this->parse_tax_query( $qv );
 
@@ -1683 +1683 @@
 
         // Category stuff
-        if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query ) {
+        if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
             $q['cat'] = ''.urldecode($q['cat']).'';
             $q['cat'] = addslashes_gpc($q['cat']);
@@ -1737 +1737 @@
 
         // Tag stuff
-        if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query ) {
+        if ( '' != $q['tag'] && !$this->is_singular && md5(serialize( $this->query_vars ) ) != $this->query_vars_hash ) {
             if ( strpos($q['tag'], ',') !== false ) {
                 $tags = preg_split('/[,\s]+/', $q['tag']);
@@ -1809 +1809 @@
         }
 
-        $this->parsed_tax_query = true;
+        $this->query_vars_hash = md5(serialize( $this->query_vars ) );
 
         $this->tax_query = new WP_Tax_Query( $tax_query );