Merge from WP Core.

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@31 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 7 insertions, 0 deletions

diff --git a/wp-inst/wp-includes/classes.php b/wp-inst/wp-includes/classes.php
index ca4c082..94f3e52 100644
--- a/wp-inst/wp-includes/classes.php
+++ b/wp-inst/wp-includes/classes.php
@@ -9,6 +9,7 @@ class WP_Query {
 	var $posts;
 	var $post_count = 0;
 	var $current_post = -1;
+	var $in_the_loop = false;
 	var $post;
 
 	var $is_single = false;
@@ -55,6 +56,7 @@ class WP_Query {
 		unset($this->queried_object_id);
 		$this->post_count = 0;
 		$this->current_post = -1;
+		$this->in_the_loop = false;
 	}
 
 	// Reparse the query vars.
@@ -593,6 +595,7 @@ class WP_Query {
 
 	function the_post() {
 		global $post;
+		$this->in_the_loop = true;
 		$post = $this->next_post();
 		setup_postdata($post);
 	}
@@ -600,8 +603,12 @@ class WP_Query {
 	function have_posts() {
 		if ($this->current_post + 1 < $this->post_count) {
 			return true;
+		} elseif ($this->current_post + 1 == $this->post_count) {
+			// Do some cleaning up after the loop
+			$this->rewind_posts();
 		}
 
+		$this->in_the_loop = false;
 		return false;
 	}