From 7cc32c39906ba0405a6f24c2531e87c28fd6e44e Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Thu, 8 Nov 2012 13:52:40 +0000 Subject: [PATCH] If $this->posts is empty, don't do stuff to it. Props wonderboymusic fixes #22061 git-svn-id: http://core.svn.wordpress.org/trunk@22465 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/query.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/wp-includes/query.php b/wp-includes/query.php index 882d027914..615d8cf7bd 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -2770,18 +2770,20 @@ class WP_Query { if ( !$q['suppress_filters'] ) $this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) ); - $this->post_count = count( $this->posts ); - // Ensure that any posts added/modified via one of the filters above are // of the type WP_Post and are filtered. - if ( $this->posts ) + if ( $this->posts ) { + $this->post_count = count( $this->posts ); + $this->posts = array_map( 'get_post', $this->posts ); - if ( $q['cache_results'] ) - update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']); + if ( $q['cache_results'] ) + update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']); - if ( $this->post_count > 0 ) { - $this->post = $this->posts[0]; + $this->post = reset( $this->posts ); + } else { + $this->post_count = 0; + $this->posts = array(); } return $this->posts;