sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't read from the switched global. Instead use _wp_switched_stack. switched is retained for back compat and should not be directly read since it is prone to stompage by plugins. see #21459 

git-svn-id: https://develop.svn.wordpress.org/trunk@22015 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2012-09-26 17:02:44 +00:00
parent 5a03a885f3
commit 8628f13d69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/ms-blogs.php
View File

@ -520,7 +520,7 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
function restore_current_blog() { function restore_current_blog() {
global $wpdb, $wp_roles; global $wpdb, $wp_roles;
if ( ! $GLOBALS['switched'] ) if ( empty( $GLOBALS['_wp_switched_stack'] ) )
return false; return false;
$blog = array_pop( $GLOBALS['_wp_switched_stack'] ); $blog = array_pop( $GLOBALS['_wp_switched_stack'] );
@ -580,7 +580,7 @@ function restore_current_blog() {
* @return bool True if switched, false otherwise. * @return bool True if switched, false otherwise.
*/ */
function ms_is_switched() { function ms_is_switched() {
return $GLOBALS['switched']; return ! empty( $GLOBALS['_wp_switched_stack'] );
} }
/** /**