Changeset 11406

Timestamp:

05/20/2009 04:05:23 PM (15 years ago)

Author:

ryan

Message:

Remove global regs that can poison query objects. fixes #9854

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• query.php (modified) (4 diffs)

trunk/wp-includes/classes.php

@@ -415 +415 @@
         }
 
-        $GLOBALS['query_string'] = & $this->query_string;
+        $GLOBALS['query_string'] = $this->query_string;
         $GLOBALS['posts'] = & $wp_query->posts;
-        $GLOBALS['post'] = & $wp_query->post;
-        $GLOBALS['request'] = & $wp_query->request;
+        $GLOBALS['post'] = $wp_query->post;
+        $GLOBALS['request'] = $wp_query->request;
 
         if ( is_single() || is_page() ) {

trunk/wp-includes/query.php

@@ -74 +74 @@
  */
 function wp_reset_query() {
-    foreach ( array('id', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'post', 'wp_query') as $var )
-        unset($GLOBALS[$var]);
+    unset($GLOBALS['wp_query']);
     $GLOBALS['wp_query'] =& $GLOBALS['wp_the_query'];
     global $wp_query;
@@ -2376 +2375 @@
      */
     function the_post() {
-        unset($GLOBALS['post']); // Break the ref
         global $post;
         $this->in_the_loop = true;
         $post = $this->next_post();
         setup_postdata($post);
-        do_action('the_post', $post);
 
         if ( $this->current_post == 0 ) // loop has just started
@@ -2650 +2647 @@
  *
  * @param object $post Post data.
+ * @uses do_action_ref_array() Calls 'the_post'
  * @return bool True when finished.
  */
@@ -2655 +2653 @@
     global $id, $authordata, $day, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
+    do_action_ref_array('the_post', array(&$post));
+    
     $id = (int) $post->ID;