Changeset 25310

Timestamp:

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

Author:

wonderboymusic

Message:

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

Props markoheijnen, ryan.
Fixes #21394.

Location:

trunk/src/wp-includes

Files:

• category-template.php (modified) (2 diffs)
• general-template.php (modified) (4 diffs)
• link-template.php (modified) (1 diff)
• template.php (modified) (1 diff)

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

@@ -466 +466 @@
         if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
             $current_term_object = get_queried_object();
-            if ( $r['taxonomy'] == $current_term_object->taxonomy )
+            if ( $current_term_object && $r['taxonomy'] === $current_term_object->taxonomy )
                 $r['current_category'] = get_queried_object_id();
         }
@@ -1038 +1038 @@
  */
 function term_description( $term = 0, $taxonomy = 'post_tag' ) {
-    if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
+    if ( ! $term && ( is_tax() || is_tag() || is_category() ) ) {
         $term = get_queried_object();
-        $taxonomy = $term->taxonomy;
-        $term = $term->term_id;
+        if ( $term ) {
+            $taxonomy = $term->taxonomy;
+            $term = $term->term_id;
+        }
     }
     $description = get_term_field( 'description', $term, $taxonomy );

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 );
     }
 

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

@@ -714 +714 @@
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-    if ( is_null( $term ) ) {
+    if ( is_null( $term ) )
         $term = get_queried_object();
-    }
+
+    if ( ! $term )
+        return;
 
     $tax = get_taxonomy( $term->taxonomy );
-    if ( !current_user_can($tax->cap->edit_terms) )
+    if ( ! current_user_can( $tax->cap->edit_terms ) )
         return;
 

trunk/src/wp-includes/template.php

@@ -257 +257 @@
         // If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
         $post = get_queried_object();
-        $pagename = $post->post_name;
+        if ( $post )
+            $pagename = $post->post_name;
     }