Changeset 25310 for trunk/src/wp-includes/general-template.php

Timestamp:

09/10/2013 02:27:24 AM (12 years ago)

Author:

wonderboymusic

Message:

Make sure the queried object is non-null before accessing its properties.

Props markoheijnen, ryan.
Fixes #21394.

File:

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

trunk/src/wp-includes/general-template.php

@@ -593 +593 @@
     if ( is_tax() ) {
         $term = get_queried_object();
-        $tax = get_taxonomy( $term->taxonomy );
-        $title = single_term_title( $tax->labels->name . $t_sep, false );
+        if ( $term ) {
+            $tax = get_taxonomy( $term->taxonomy );
+            $title = single_term_title( $tax->labels->name . $t_sep, false );
+        }
     }
 
@@ -600 +602 @@
     if ( is_author() ) {
         $author = get_queried_object();
-        $title = $author->display_name;
+        if ( $author )
+            $title = $author->display_name;
     }
 
@@ -1693 +1696 @@
         $term = get_queried_object();
 
-        $title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
-        $href = get_category_feed_link( $term->term_id );
+        if ( $term ) {
+            $title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
+            $href = get_category_feed_link( $term->term_id );
+        }
     } elseif ( is_tag() ) {
         $term = get_queried_object();
 
-        $title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
-        $href = get_tag_feed_link( $term->term_id );
+        if ( $term ) {
+            $title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
+            $href = get_tag_feed_link( $term->term_id );
+        }
     } elseif ( is_author() ) {
         $author_id = intval( get_query_var('author') );
@@ -1710 +1717 @@
     } elseif ( is_post_type_archive() ) {
         $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
-        $href = get_post_type_archive_feed_link( get_queried_object()->name );
+        $post_type_obj = get_queried_object();
+        if ( $post_type_obj )
+            $href = get_post_type_archive_feed_link( $post_type_obj->name );
     }