Changeset 25386

Timestamp:

09/12/2013 05:31:14 AM (12 years ago)

Author:

wonderboymusic

Message:

Add sanity checks to get_*_template() functions to ensure that the return value of get_queried_object() is compatible with the assumed context.

Fixes #25291.
See #25282.

File:

• trunk/src/wp-includes/template.php (modified) (7 diffs)

trunk/src/wp-includes/template.php

@@ -84 +84 @@
     if ( is_array( $post_type ) )
         $post_type = reset( $post_type );
-    
+
     $obj = get_post_type_object( $post_type );
     if ( ! $obj->has_archive )
@@ -104 +104 @@
     $templates = array();
 
-    if ( $author ) {
+    if ( is_a( $author, 'WP_User' ) ) {
         $templates[] = "author-{$author->user_nicename}.php";
         $templates[] = "author-{$author->ID}.php";
@@ -130 +130 @@
     $templates = array();
 
-    if ( $category ) {
+    if ( ! empty( $category->slug ) ) {
         $templates[] = "category-{$category->slug}.php";
         $templates[] = "category-{$category->term_id}.php";
@@ -156 +156 @@
     $templates = array();
 
-    if ( $tag ) {
+    if ( ! empty( $tag->slug ) ) {
         $templates[] = "tag-{$tag->slug}.php";
         $templates[] = "tag-{$tag->term_id}.php";
@@ -187 +187 @@
     $templates = array();
 
-    if ( $term ) {
+    if ( ! empty( $term->slug ) ) {
         $taxonomy = $term->taxonomy;
         $templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
@@ -311 +311 @@
     $templates = array();
 
-    if ( $object )
+    if ( ! empty( $object->post_type ) )
         $templates[] = "single-{$object->post_type}.php";
     $templates[] = "single.php";
@@ -342 +342 @@
             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;
+            elseif ( ! empty( $type[1] ) ) {
+                if ( $template = get_query_template( $type[1] ) )
+                    return $template;
+                elseif ( $template = get_query_template( "$type[0]_$type[1]" ) )
+                    return $template;
+            }
         }
     }