Changeset 16115

Timestamp:

10/31/2010 11:23:10 AM (14 years ago)

Author:

scribu

Message:

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

File:

• trunk/wp-includes/theme.php (modified) (5 diffs)

trunk/wp-includes/theme.php

@@ -801 +801 @@
  */
 function get_author_template() {
-    $author_id = absint( get_query_var( 'author' ) );
-    $author = get_user_by( 'id', $author_id );
-    $author = $author->user_nicename;
+    $author = get_queried_object();
 
     $templates = array();
 
-    if ( $author )
-        $templates[] = "author-{$author}.php";
-    if ( $author_id )
-        $templates[] = "author-{$author_id}.php";
+    $templates[] = "author-{$author->user_nicename}.php";
+    $templates[] = "author-{$author->ID}.php";
     $templates[] = 'author.php';
 
@@ -829 +825 @@
  */
 function get_category_template() {
-    $cat_ID = absint( get_query_var('cat') );
-    $category = get_category( $cat_ID );
+    $category = get_queried_object();
 
     $templates = array();
 
-    if ( !is_wp_error( $category ) )
-        $templates[] = "category-{$category->slug}.php";
-
-    $templates[] = "category-$cat_ID.php";
+    $templates[] = "category-{$category->slug}.php";
+    $templates[] = "category-{$category->term_id}.php";
     $templates[] = "category.php";
 
@@ -857 +850 @@
 function get_tag_template() {
     $tag = get_queried_object();
-    $tag_name = $tag->slug;
-    $tag_id = $tag->term_id;
 
     $templates = array();
 
-    if ( $tag_name )
-        $templates[] = "tag-$tag_name.php";
-    if ( $tag_id )
-        $templates[] = "tag-$tag_id.php";
+    $templates[] = "tag-{$tag->slug}.php";
+    $templates[] = "tag-{$tag->term_id}.php";
     $templates[] = "tag.php";
 
@@ -889 +878 @@
  */
 function get_taxonomy_template() {
-    $taxonomy = get_query_var('taxonomy');
-    $term = get_query_var('term');
+    $term = get_queried_object();
+    $taxonomy = $term->taxonomy;
 
     $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";
 
@@ -1016 +1003 @@
 function get_single_template() {
     $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 );