Preserve the original query object as wp_the_query so that it's not stomped by subsequent calls to query_posts().
git-svn-id: https://develop.svn.wordpress.org/trunk@4460 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
e94e7229c9
commit
be689d80a3
@ -249,8 +249,9 @@ class WP {
|
||||
}
|
||||
|
||||
function query_posts() {
|
||||
global $wp_the_query;
|
||||
$this->build_query_string();
|
||||
query_posts($this->query_vars);
|
||||
$wp_the_query->query($this->query_vars);
|
||||
}
|
||||
|
||||
function handle_404() {
|
||||
|
@ -11,8 +11,9 @@ function get_query_var($var) {
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -226,9 +226,10 @@ $_SERVER = add_magic_quotes($_SERVER);
|
||||
|
||||
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();
|
||||
define('TEMPLATEPATH', get_template_directory());
|
||||
|
Loading…
Reference in New Issue
Block a user