Changeset 16792

Timestamp:

12/08/2010 08:57:38 AM (15 years ago)

Author:

scribu

Message:

Set queried object on CPT archives. Fixes #15730

Location:

trunk/wp-includes

Files:

• general-template.php (modified) (1 diff)
• query.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -668 +668 @@
         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 );
 

trunk/wp-includes/query.php

@@ -2676 +2676 @@
                 $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');