Ticket #37424: 37424.patch

wp-includes/query.php

@@ -1731 +1731 @@
                                 }
                         }
                         unset( $tax_query );
-
+                        
                         if ( empty($qv['author']) || ($qv['author'] == '0') ) {
                                 $this->is_author = false;
                         } else {
@@ -2822 +2822 @@
                         $where .= $clauses['where'];
                 }
 
+                if ( empty( $post_type ) && ( $this->is_category || $this->is_tag || $this->is_tax ) ) {
+                        
+                        $taxonomy = array_keys ( $this->tax_query->queried_terms );
+                        
+                        if ( count ( $taxonomy ) == 1 ) 
+                        {
+                                $taxonomy = array_shift ( $taxonomy );
+                                $taxonomy = get_taxonomy ( $taxonomy );
+                                
+                                if ( $taxonomy )
+                                {
+                                        if ( empty ( $taxonomy->query_post_types ) )
+                                        {
+                                                $post_type = $taxonomy->object_type;
+                                                $post_type = array_intersect ( $post_type,  get_post_types( array ( 'public' => 1 ) ) );
+                                        }
+                                        else
+                                        {
+                                                $post_type = (array) $taxonomy->query_post_types;
+                                        }
+                                }
+                        }
+                }
+                                
                 if ( $this->is_tax ) {
                         if ( empty($post_type) ) {
                                 // Do a fully inclusive search for currently registered post types of queried taxonomies

wp-includes/taxonomy.php

@@ -338 +338 @@
  *     @type string        $query_var             Sets the query var key for this taxonomy. Default `$taxonomy` key. If
  *                                                false, a taxonomy cannot be loaded at `?{query_var}={term_slug}`. If a
  *                                                string, the query `?{query_var}={term_slug}` will be valid.
+ *     @type array|string  $query_post_types      Set the post type(s) to query in the taxonomy archive, defaults to all 
+ *                                                publicly attached post types.
  *     @type callable      $update_count_callback Works much like a hook, in that it will be called when the count is
  *                                                updated. Default _update_post_term_count() for taxonomies attached
  *                                                to post types, which confirms that the objects are published before
@@ -383 +385 @@
                 'capabilities'          => array(),
                 'rewrite'               => true,
                 'query_var'             => $taxonomy,
+                'query_post_types'      => null,
                 'update_count_callback' => '',
                 '_builtin'              => false,
         );