From 8628f13d6970f40072c27f4837919e79bff06a37 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Wed, 26 Sep 2012 17:02:44 +0000
Subject: [PATCH] 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
---
 wp-includes/ms-blogs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 1ca85f0a2c..5ea0fea108 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -520,7 +520,7 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
 function restore_current_blog() {
 	global $wpdb, $wp_roles;
 
-	if ( ! $GLOBALS['switched'] )
+	if ( empty( $GLOBALS['_wp_switched_stack'] ) )
 		return false;
 
 	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
@@ -580,7 +580,7 @@ function restore_current_blog() {
  * @return bool True if switched, false otherwise.
  */
 function ms_is_switched() {
-	return $GLOBALS['switched'];
+	return ! empty( $GLOBALS['_wp_switched_stack'] );
 }
 
 /**