From 1fda14e76b0d421c2cc536addebc17bb3065fb26 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Tue, 24 Sep 2013 15:53:09 +0000
Subject: [PATCH] Introduce a reset_postdata() method on the WP_Query object,
 which wp_reset_postdata() now wraps.

props ericlewis.
fixes #24785.

Built from https://develop.svn.wordpress.org/trunk@25601


git-svn-id: http://core.svn.wordpress.org/trunk@25518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/query.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 165cb6cb3b..c1ed984837 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -108,17 +108,14 @@ function wp_reset_query() {
 
 /**
  * After looping through a separate query, this function restores
- * the $post global to the current post in the main query
+ * the $post global to the current post in the main query.
  *
  * @since 3.0.0
  * @uses $wp_query
  */
 function wp_reset_postdata() {
 	global $wp_query;
-	if ( !empty($wp_query->post) ) {
-		$GLOBALS['post'] = $wp_query->post;
-		setup_postdata($wp_query->post);
-	}
+	$wp_query->reset_postdata();
 }
 
 /*
@@ -3628,6 +3625,21 @@ class WP_Query {
 		global $wp_the_query;
 		return $wp_the_query === $this;
 	}
+
+	/**
+	 * After looping through a nested query, this function
+	 * restores the $post global to the current post in this query.
+	 *
+	 * @since 3.7.0
+	 *
+	 * @return bool
+	 */
+	function reset_postdata() {
+		if ( ! empty( $this->post ) ) {
+			$GLOBALS['post'] = $this->post;
+			setup_postdata( $this->post );
+		}
+	}
 }
 
 /**