Changes from trunk/wp-includes/query.php at r17455 to branches/3.1/wp-includes/query.php at r17553

File:

• branches/3.1/wp-includes/query.php (modified) (14 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;
+
+    /**
+     * 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']) )
@@ -1497 +1507 @@
             }
 
-            $this->parsed_tax_query = false;
+            $this->query_vars_hash = false;
             $this->parse_tax_query( $qv );
 
@@ -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));
     }
@@ -1655 +1668 @@
 
         foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+            if ( 'post_tag' == $taxonomy )
+                continue;   // Handled further down in the $q['tag'] block
+
             if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
                 $tax_query_defaults = array(
@@ -1683 +1699 @@
 
         // 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 && $this->query_vars_changed ) {
             $q['cat'] = ''.urldecode($q['cat']).'';
             $q['cat'] = addslashes_gpc($q['cat']);
@@ -1737 +1753 @@
 
         // Tag stuff
-        if ( '' != $q['tag'] && !$this->is_singular && !$this->parsed_tax_query ) {
+        if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
             if ( strpos($q['tag'], ',') !== false ) {
                 $tags = preg_split('/[,\s]+/', $q['tag']);
@@ -1791 +1807 @@
 
         if ( !empty($q['tag_slug__in']) ) {
-            $q['tag_slug__in'] = array_map('sanitize_title', (array) $q['tag_slug__in']);
+            $q['tag_slug__in'] = array_map('sanitize_title', array_unique( (array) $q['tag_slug__in'] ) );
             $tax_query[] = array(
                 'taxonomy' => 'post_tag',
@@ -1800 +1816 @@
 
         if ( !empty($q['tag_slug__and']) ) {
-            $q['tag_slug__and'] = array_map('sanitize_title', (array) $q['tag_slug__and']);
+            $q['tag_slug__and'] = array_map('sanitize_title', array_unique( (array) $q['tag_slug__and'] ) );
             $tax_query[] = array(
                 'taxonomy' => 'post_tag',
@@ -1809 +1825 @@
         }
 
-        $this->parsed_tax_query = true;
-
         $this->tax_query = new WP_Tax_Query( $tax_query );
     }
@@ -1880 +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
@@ -2148 +2171 @@
 
         // Taxonomies
-        $this->parse_tax_query( $q );
-
-        $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
-
-        $join .= $clauses['join'];
-        $where .= $clauses['where'];
+        if ( !$this->is_singular ) {
+            $this->parse_tax_query( $q );
+
+            $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
+
+            $join .= $clauses['join'];
+            $where .= $clauses['where'];
+        }
 
         if ( $this->is_tax ) {
@@ -2438 +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'] );
         }
 
@@ -2893 +2928 @@
                 $this->queried_object = $term;
                 $this->queried_object_id = (int) $term->term_id;
+
+                if ( $this->is_category )
+                    _make_cat_compat( $this->queried_object );
             }
         } elseif ( $this->is_post_type_archive ) {