Changeset 4460

Timestamp:

11/09/2006 06:50:58 AM (19 years ago)

Author:

ryan

Message:

Preserve the original query object as wp_the_query so that it's not stomped by subsequent calls to query_posts().

Location:

trunk

Files:

• wp-includes/classes.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -250 +250 @@
 
     function query_posts() {
+        global $wp_the_query;
         $this->build_query_string();
-        query_posts($this->query_vars);
+        $wp_the_query->query($this->query_vars);
     }
 

trunk/wp-includes/query.php

@@ -12 +12 @@
 
 function &query_posts($query) {
-    global $wp_query;
-    return $wp_query->query($query);
+    unset($GLOBALS['wp_query']);
+    $GLOBALS['wp_query'] =& new WP_Query();
+    return $GLOBALS['wp_query']->query($query);
 }
 

trunk/wp-settings.php

@@ -227 +227 @@
 do_action('sanitize_comment_cookies');
 
-$wp_query   = new WP_Query();
-$wp_rewrite = new WP_Rewrite();
-$wp         = new WP();
+$wp_the_query =& new WP_Query();
+$wp_query     =& $wp_the_query;
+$wp_rewrite   =& new WP_Rewrite();
+$wp           =& new WP();
 
 validate_current_theme();