Changeset 25310 for trunk/src/wp-includes/category-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/category-template.php (modified) (2 diffs)

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