Ticket #29660: query-patch.diff

src/wp-includes/query.php

@@ -4038 +4038 @@
                 $attachment = (array) $attachment;
 
                 $post_obj = $this->get_queried_object();
+                
+                if ( ! $post_obj ) {
+                        return false;
+                }
 
                 if ( in_array( $post_obj->ID, $attachment ) ) {
                         return true;
@@ -4068 +4072 @@
                         return true;
 
                 $author_obj = $this->get_queried_object();
+                
+                if ( ! $author_obj ) {
+                        return false;
+                }
 
                 $author = (array) $author;
 
@@ -4100 +4108 @@
                         return true;
 
                 $cat_obj = $this->get_queried_object();
+                
+                if ( ! $cat_obj ) {
+                        return false;
+                }
 
                 $category = (array) $category;
 
@@ -4132 +4144 @@
                         return true;
 
                 $tag_obj = $this->get_queried_object();
+                
+                if ( ! $tag_obj ) {
+                        return false;
+                }
 
                 $tag = (array) $tag;
 
@@ -4171 +4187 @@
                         return true;
 
                 $queried_object = $this->get_queried_object();
+                
+                if ( ! $queried_object ) {
+                        return false;
+                }
+                
                 $tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
                 $term_array = (array) $term;
 
@@ -4331 +4352 @@
                         return true;
 
                 $page_obj = $this->get_queried_object();
+                
+                if ( ! $page_obj ) {
+                        return false;
+                }
 
                 $page = (array) $page;
 
@@ -4424 +4449 @@
                         return true;
 
                 $post_obj = $this->get_queried_object();
+                
+                if ( ! $post_obj ) {
+                        return false;
+                }
 
                 $post = (array) $post;
 
@@ -4467 +4496 @@
                         return (bool) $this->is_singular;
 
                 $post_obj = $this->get_queried_object();
+                
+                if ( ! $post_obj ) {
+                        return false;
+                }
 
                 return in_array( $post_obj->post_type, (array) $post_types );
         }