Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Avoid notices in get_*_template() functions that use get_queried_object(), which can return null. Props wonderboymusic. fixes #20519

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@22293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-10-25 12:54:50 +00:00
parent c7f18926e6
commit 5c713162f1
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
wp-includes/template.php
View File

@ -82,8 +82,10 @@ function get_author_template() {
$templates = array();
$templates[] = "author-{$author->user_nicename}.php";
$templates[] = "author-{$author->ID}.php";
if ( $author ) {
$templates[] = "author-{$author->user_nicename}.php";
$templates[] = "author-{$author->ID}.php";
}
$templates[] = 'author.php';
return get_query_template( 'author', $templates );
@ -106,8 +108,10 @@ function get_category_template() {
$templates = array();
$templates[] = "category-{$category->slug}.php";
$templates[] = "category-{$category->term_id}.php";
if ( $category ) {
$templates[] = "category-{$category->slug}.php";
$templates[] = "category-{$category->term_id}.php";
}
$templates[] = 'category.php';
return get_query_template( 'category', $templates );
@ -130,8 +134,10 @@ function get_tag_template() {
$templates = array();
$templates[] = "tag-{$tag->slug}.php";
$templates[] = "tag-{$tag->term_id}.php";
if ( $tag ) {
$templates[] = "tag-{$tag->slug}.php";
$templates[] = "tag-{$tag->term_id}.php";
}
$templates[] = 'tag.php';
return get_query_template( 'tag', $templates );
@ -156,12 +162,14 @@ function get_tag_template() {
*/
function get_taxonomy_template() {
$term = get_queried_object();
$taxonomy = $term->taxonomy;
$templates = array();
$templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
$templates[] = "taxonomy-$taxonomy.php";
if ( $term ) {
$taxonomy = $term->taxonomy;
$templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
$templates[] = "taxonomy-$taxonomy.php";
}
$templates[] = 'taxonomy.php';
return get_query_template( 'taxonomy', $templates );
@ -280,7 +288,8 @@ function get_single_template() {
$templates = array();
$templates[] = "single-{$object->post_type}.php";
if ( $object )
$templates[] = "single-{$object->post_type}.php";
$templates[] = "single.php";
return get_query_template( 'single', $templates );
@ -303,15 +312,21 @@ function get_single_template() {
*/
function get_attachment_template() {
global $posts;
$type = explode('/', $posts[0]->post_mime_type);
if ( $template = get_query_template($type[0]) )
return $template;
elseif ( $template = get_query_template($type[1]) )
return $template;
elseif ( $template = get_query_template("$type[0]_$type[1]") )
return $template;
else
return get_query_template('attachment');
if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
$type = explode( '/', $posts[0]->post_mime_type );
if ( ! empty( $type ) ) {
if ( $template = get_query_template( $type[0] ) )
return $template;
elseif ( $template = get_query_template( $type[1] ) )
return $template;
elseif ( $template = get_query_template( "$type[0]_$type[1]" ) )
return $template;
}
}
return get_query_template( 'attachment' );
}
/**