Ticket #5439: reset_query.2.diff

wp-includes/query.php

@@ -25 +25 @@
-function wp_reset_query() {
-        unset($GLOBALS['wp_query']);
-        $GLOBALS['wp_query'] =& $GLOBALS['wp_the_query'];
+        global $wp_query;
+        if ( !empty($wp_query->post) ) {
+                $GLOBALS['post'] = $wp_query->post;
+                setup_postdata($wp_query->post);
+        }
-}
-
-/*

wp-includes/widgets.php

@@ -874 +874 @@
-                        </ul>
-                <?php echo $after_widget; ?>
-<?php
+                wp_reset_query();  // Restore global post data stomped by the_post().
-        endif;
-        wp_cache_add('widget_recent_entries', ob_get_flush());
-}