WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't assign wp_the_query to wp_query by reference. Removing the ref avoids accidentally stomping wp_the_query. 

Props scribu, wpmuguru
fixes #22125


git-svn-id: http://core.svn.wordpress.org/trunk@22434 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-11-07 20:03:28 +00:00
parent 039279db28
commit 33fe750dce
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/query.php
View File

@ -87,7 +87,6 @@ function set_query_var($var, $value) {
* @return array List of posts
*/
function query_posts($query) {
unset($GLOBALS['wp_query']);
$GLOBALS['wp_query'] = new WP_Query();
return $GLOBALS['wp_query']->query($query);
}
@ -103,7 +102,6 @@ function query_posts($query) {
* @uses $wp_query
*/
function wp_reset_query() {
unset($GLOBALS['wp_query']);
$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
wp_reset_postdata();
}

2
wp-settings.php
View File

@ -233,7 +233,7 @@ $wp_the_query = new WP_Query();
* @global object $wp_query
* @since 1.5.0
*/
$wp_query =& $wp_the_query;
$wp_query = $wp_the_query;
/**
* Holds the WordPress Rewrite object for creating pretty URLs