From cae6e8d4ef4a1e0eefed9ad6d77907177def926c Mon Sep 17 00:00:00 2001 From: scribu Date: Wed, 8 Dec 2010 08:57:38 +0000 Subject: [PATCH] Set queried object on CPT archives. Fixes #15730 git-svn-id: https://develop.svn.wordpress.org/trunk@16792 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/general-template.php | 3 +-- wp-includes/query.php | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 876124e7fc..1ec7e1a762 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -667,8 +667,7 @@ function post_type_archive_title( $prefix = '', $display = true ) { 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 ) diff --git a/wp-includes/query.php b/wp-includes/query.php index 015577dae3..e38c2dbaba 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -2675,6 +2675,8 @@ class WP_Query { $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 );