Ticket #37645: 37645.patch

wp-includes/query.php

@@ -4259 +4259 @@
                         return true;
                 }
 
-                $attachment = array_map( 'strval', (array) $attachment );
-
                 $post_obj = $this->get_queried_object();
 
+                $attachment = (array) $attachment;
+
+                foreach ( $attachment as $key => $value ) {
+                        if ( ! ( is_array( $value ) || is_object( $value ) && !method_exists( $value, '__toString' ) ) ) {
+                                $attachment[ $key ] = strval( $value );
+                        }
+                }
+
                 if ( in_array( (string) $post_obj->ID, $attachment ) ) {
                         return true;
                 } elseif ( in_array( $post_obj->post_title, $attachment ) ) {
@@ -4270 +4276 @@
                 } elseif ( in_array( $post_obj->post_name, $attachment ) ) {
                         return true;
                 }
+
                 return false;
         }
 
@@ -4293 +4300 @@
 
                 $author_obj = $this->get_queried_object();
 
-                $author = array_map( 'strval', (array) $author );
+                $author = (array) $author;
 
+                foreach ( $author as $key => $value ) {
+                        if ( ! ( is_array( $value ) || is_object( $value ) && !method_exists( $value, '__toString' ) ) ) {
+                                $author[ $key ] = strval( $value );
+                        }
+                }
+
                 if ( in_array( (string) $author_obj->ID, $author ) )
                         return true;
                 elseif ( in_array( $author_obj->nickname, $author ) )
@@ -4325 +4338 @@
 
                 $cat_obj = $this->get_queried_object();
 
-                $category = array_map( 'strval', (array) $category );
+                $category = (array) $category;
 
+                foreach ( $category as $key => $value ) {
+                        if ( ! ( is_array( $value ) || is_object( $value ) && !method_exists( $value, '__toString' ) ) ) {
+                                $category[ $key ] = strval( $value );
+                        }
+                }
+
                 if ( in_array( (string) $cat_obj->term_id, $category ) )
                         return true;
                 elseif ( in_array( $cat_obj->name, $category ) )
@@ -4357 +4376 @@
 
                 $tag_obj = $this->get_queried_object();
 
-                $tag = array_map( 'strval', (array) $tag );
+                $tag = (array) $tag;
 
+                foreach ( $tag as $key => $value ) {
+                        if ( ! ( is_array( $value ) || is_object( $value ) && !method_exists( $value, '__toString' ) ) ) {
+                                $tag[ $key ] = strval( $value );
+                        }
+                }
+
                 if ( in_array( (string) $tag_obj->term_id, $tag ) )
                         return true;
                 elseif ( in_array( $tag_obj->name, $tag ) )
@@ -4559 +4584 @@
 
                 $page_obj = $this->get_queried_object();
 
-                $page = array_map( 'strval', (array) $page );
+                $page = (array) $page;
 
+                foreach ( $page as $key => $value ) {
+                        if ( ! ( is_array( $value ) || is_object( $value ) && !method_exists( $value, '__toString' ) ) ) {
+                                $page[ $key ] = strval( $value );
+                        }
+                }
+
                 if ( in_array( (string) $page_obj->ID, $page ) ) {
                         return true;
                 } elseif ( in_array( $page_obj->post_title, $page ) ) {
@@ -4652 +4683 @@
 
                 $post_obj = $this->get_queried_object();
 
-                $post = array_map( 'strval', (array) $post );
+                $post = (array) $post;
 
+                foreach ( $post as $key => $value ) {
+                        if ( ! ( is_array( $value ) || is_object( $value ) && !method_exists( $value, '__toString' ) ) ) {
+                                $post[ $key ] = strval( $value );
+                        }
+                }
+
                 if ( in_array( (string) $post_obj->ID, $post ) ) {
                         return true;
                 } elseif ( in_array( $post_obj->post_title, $post ) ) {