Changeset 22015

Timestamp:

09/26/2012 05:02:44 PM (12 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/ms-blogs.php (modified) (2 diffs)

trunk/wp-includes/ms-blogs.php

@@ -521 +521 @@
     global $wpdb, $wp_roles;
 
-    if ( ! $GLOBALS['switched'] )
+    if ( empty( $GLOBALS['_wp_switched_stack'] ) )
         return false;
 
@@ -581 +581 @@
  */
 function ms_is_switched() {
-    return $GLOBALS['switched'];
+    return ! empty( $GLOBALS['_wp_switched_stack'] );
 }