Ticket #15730: 15730.diff

wp-includes/query.php

@@ -2675 +2675 @@
                                 $this->queried_object = $term;
                                 $this->queried_object_id = (int) $term->term_id;
                         }
+                } 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 );

wp-includes/general-template.php

@@ -667 +696 @@
         if ( ! is_post_type_archive() )
                 return;
 
-
-        $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
+        $post_type_obj = get_queried_object();
         $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
 
         if ( $display )