Ticket #21394: 21394.diff

wp-includes/query.php

@@ -3119 +3119 @@
                         return true;
 
                 $author_obj = $this->get_queried_object();
+                if ( empty( $author_obj ) )
+                        return false;
 
                 $author = (array) $author;
 
@@ -3144 +3146 @@
          * @return bool
          */
         function is_category( $category = '' ) {
-                if ( !$this->is_category )
+                if ( ! $this->is_category )
                         return false;
 
-                if ( empty($category) )
+                if ( empty( $category ) )
                         return true;
 
                 $cat_obj = $this->get_queried_object();
+                if ( empty( $cat_obj ) )
+                        return false;
 
                 $category = (array) $category;
 
@@ -3176 +3180 @@
          * @return bool
          */
         function is_tag( $slug = '' ) {
-                if ( !$this->is_tag )
+                if ( ! $this->is_tag )
                         return false;
 
                 if ( empty( $slug ) )
                         return true;
 
                 $tag_obj = $this->get_queried_object();
+                if ( empty( $tag_obj ) )
+                        return false;
 
                 $slug = (array) $slug;
 
@@ -3371 +3377 @@
          * @return bool
          */
         function is_page( $page = '' ) {
-                if ( !$this->is_page )
+                if ( ! $this->is_page )
                         return false;
 
                 if ( empty( $page ) )
                         return true;
 
                 $page_obj = $this->get_queried_object();
+                if ( empty( $page_obj ) )
+                        return false;
 
                 $page = (array) $page;
 
@@ -3452 +3460 @@
          * @return bool
          */
         function is_single( $post = '' ) {
-                if ( !$this->is_single )
+                if ( ! $this->is_single )
                         return false;
 
-                if ( empty($post) )
+                if ( empty( $post ) )
                         return true;
 
                 $post_obj = $this->get_queried_object();
+                if ( empty( $post_obj ) )
+                        return false;
 
                 $post = (array) $post;
 
@@ -3491 +3501 @@
                         return (bool) $this->is_singular;
 
                 $post_obj = $this->get_queried_object();
+                if ( empty( $post_obj ) )
+                        return false;
 
                 return in_array( $post_obj->post_type, (array) $post_types );
         }