Ticket #19939: even-better-patch.diff

wp-includes/query.php

@@ -2929 +2929 @@
                 $this->queried_object = null;
                 $this->queried_object_id = 0;
 
-                if ( $this->is_category || $this->is_tag || $this->is_tax ) {
+                if ( $this->is_post_type_archive ) {
+                        $this->queried_object = get_post_type_object( $this->get('post_type') );
+                } elseif ( $this->is_category || $this->is_tag || $this->is_tax ) {
                         $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
 
                         $query = reset( $tax_query_in_and );
@@ -2946 +2948 @@
                                 if ( $this->is_category )
                                         _make_cat_compat( $this->queried_object );
                         }
-                } elseif ( $this->is_post_type_archive ) {
-                        $this->queried_object = get_post_type_object( $this->get('post_type') );
                 } elseif ( $this->is_posts_page ) {
                         $page_for_posts = get_option('page_for_posts');
                         $this->queried_object = & get_page( $page_for_posts );