Changeset 17246

Timestamp:

01/09/2011 08:49:11 PM (16 years ago)

Author:

ryan

Message:

Don't parse cat query var twice. Don't include children for category* queries. Props SergeyBiryukov. see #16152

File:

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

trunk/wp-includes/query.php

@@ -1230 +1230 @@
          */
         var $is_post_type_archive = false;
+
+        /**
+         * Whether the tax query has been parsed once.
+         *
+         * @since 3.1.0
+         * @access private
+         * @var bool
+         */
+        var $parsed_tax_query = false;
 
         /**
@@ -1486 +1495 @@
                         }
 
+                        $this->parsed_tax_query = false;
                         $this->parse_tax_query( $qv );
 
@@ -1672 +1682 @@
 
                 // Category stuff
-                if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular ) {
+                if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && !$this->parsed_tax_query ) {
                         $q['cat'] = ''.urldecode($q['cat']).'';
                         $q['cat'] = addslashes_gpc($q['cat']);
@@ -1685 +1695 @@
                                 if ( $in ) {
                                         $q['category__in'][] = $cat;
+                                        $q['category__in'] = array_merge( $q['category__in'], get_term_children($cat, 'category') );
                                 } else {
                                         $q['category__not_in'][] = $cat;
+                                        $q['category__not_in'] = array_merge( $q['category__not_in'], get_term_children($cat, 'category') );
                                 }
                         }
@@ -1697 +1709 @@
                                 'taxonomy' => 'category',
                                 'terms' => $q['category__in'],
-                                'field' => 'term_id'
+                                'field' => 'term_id',
+                                'include_children' => false
                         );
                 }
@@ -1706 +1719 @@
                                 'taxonomy' => 'category',
                                 'terms' => $q['category__not_in'],
-                                'operator' => 'NOT IN'
+                                'operator' => 'NOT IN',
+                                'include_children' => false 
                         );
                 }
@@ -1716 +1730 @@
                                 'terms' => $q['category__and'],
                                 'field' => 'term_id',
-                                'operator' => 'AND'
+                                'operator' => 'AND',
+                                'include_children' => false
                         );
                 }
@@ -1773 +1788 @@
                         );
                 }
+
+                $this->parsed_tax_query = true;
 
                 $this->tax_query = new WP_Tax_Query( $tax_query );