Ticket #16152: 16152.diff

wp-includes/query.php

@@ -1231 +1231 @@
         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;
+
+        /**
          * Resets query flags to false.
          *
          * The query flags are what page info WordPress was able to figure out.
@@ -1485 +1494 @@
                                 $this->is_date = true;
                         }
 
+                        $this->parsed_tax_query = false;
                         $this->parse_tax_query( $qv );
 
                         foreach ( $this->tax_query->queries as $tax_query ) {
@@ -1671 +1681 @@
                 }
 
                 // 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']);
                         $cat_array = preg_split('/[,\s]+/', $q['cat']);
@@ -1684 +1694 @@
                                 $cat = abs($cat);
                                 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') );
                                 }
                         }
                         $q['cat'] = implode(',', $req_cats);
@@ -1696 +1708 @@
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
                                 'terms' => $q['category__in'],
-                                'field' => 'term_id'
+                                'field' => 'term_id',
+                                'include_children' => false
                         );
                 }
 
@@ -1705 +1718 @@
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
                                 'terms' => $q['category__not_in'],
-                                'operator' => 'NOT IN'
+                                'operator' => 'NOT IN',
+                                'include_children' => false 
                         );
                 }
 
@@ -1715 +1729 @@
                                 'taxonomy' => 'category',
                                 '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 );
         }