Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 07:37:44 +02:00
Code Issues Projects Releases Wiki Activity

Use get_queried_object() in more get_*_template() functions. Fixes #15263

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-10-31 11:23:10 +00:00
parent e2efa78154
commit b890848aaa
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wp-includes/theme.php
View File

@ -800,16 +800,12 @@ function get_archive_template() {
* @return string * @return string
*/ */
function get_author_template() { function get_author_template() {
$author_id = absint( get_query_var( 'author' ) ); $author = get_queried_object();
$author = get_user_by( 'id', $author_id );
$author = $author->user_nicename;
$templates = array(); $templates = array();
if ( $author ) $templates[] = "author-{$author->user_nicename}.php";
$templates[] = "author-{$author}.php"; $templates[] = "author-{$author->ID}.php";
if ( $author_id )
$templates[] = "author-{$author_id}.php";
$templates[] = 'author.php'; $templates[] = 'author.php';
return get_query_template( 'author', $templates ); return get_query_template( 'author', $templates );
@ -828,15 +824,12 @@ function get_author_template() {
* @return string * @return string
*/ */
function get_category_template() { function get_category_template() {
$cat_ID = absint( get_query_var('cat') ); $category = get_queried_object();
$category = get_category( $cat_ID );
$templates = array(); $templates = array();
if ( !is_wp_error( $category ) ) $templates[] = "category-{$category->slug}.php";
$templates[] = "category-{$category->slug}.php"; $templates[] = "category-{$category->term_id}.php";
$templates[] = "category-$cat_ID.php";
$templates[] = "category.php"; $templates[] = "category.php";
return get_query_template( 'category', $templates ); return get_query_template( 'category', $templates );
@ -856,15 +849,11 @@ function get_category_template() {
*/ */
function get_tag_template() { function get_tag_template() {
$tag = get_queried_object(); $tag = get_queried_object();
$tag_name = $tag->slug;
$tag_id = $tag->term_id;
$templates = array(); $templates = array();
if ( $tag_name ) $templates[] = "tag-{$tag->slug}.php";
$templates[] = "tag-$tag_name.php"; $templates[] = "tag-{$tag->term_id}.php";
if ( $tag_id )
$templates[] = "tag-$tag_id.php";
$templates[] = "tag.php"; $templates[] = "tag.php";
return get_query_template( 'tag', $templates ); return get_query_template( 'tag', $templates );
@ -888,15 +877,13 @@ function get_tag_template() {
* @return string * @return string
*/ */
function get_taxonomy_template() { function get_taxonomy_template() {
$taxonomy = get_query_var('taxonomy'); $term = get_queried_object();
$term = get_query_var('term'); $taxonomy = $term->taxonomy;
$templates = array(); $templates = array();
if ( $taxonomy && $term )
$templates[] = "taxonomy-$taxonomy-$term.php";
if ( $taxonomy )
$templates[] = "taxonomy-$taxonomy.php";
$templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
$templates[] = "taxonomy-$taxonomy.php";
$templates[] = "taxonomy.php"; $templates[] = "taxonomy.php";
return get_query_template( 'taxonomy', $templates ); return get_query_template( 'taxonomy', $templates );
@ -1015,7 +1002,11 @@ function get_search_template() {
*/ */
function get_single_template() { function get_single_template() {
$object = get_queried_object(); $object = get_queried_object();
$templates = array('single-' . $object->post_type . '.php', 'single.php');
$templates = array();
$templates[] = "single-{$object->post_type}.php";
$templates[] = "single.php";
return get_query_template( 'single', $templates ); return get_query_template( 'single', $templates );
} }