Changeset 21581

Timestamp:

08/22/2012 03:34:00 AM (14 years ago)

Author:

ryan

Message:

Resurrect the switched global. Some are still using it. see #21459

Location:

trunk/wp-includes

Files:

• ms-blogs.php (modified) (6 diffs)
• ms-settings.php (modified) (1 diff)

trunk/wp-includes/ms-blogs.php

@@ -463 +463 @@
         if ( $new_blog == $GLOBALS['blog_id'] ) {
                 do_action( 'switch_blog', $new_blog, $new_blog );
-                $GLOBALS['_wp_switched'] = true;
+                $GLOBALS['switched'] = true;
                 return true;
         }
@@ -500 +500 @@
 
         do_action( 'switch_blog', $new_blog, $prev_blog_id );
-        $GLOBALS['_wp_switched'] = true;
+        $GLOBALS['switched'] = true;
 
         return true;
@@ -516 +516 @@
         global $wpdb, $wp_roles;
 
-        if ( ! $GLOBALS['_wp_switched'] )
+        if ( ! $GLOBALS['switched'] )
                 return false;
 
@@ -524 +524 @@
                 do_action( 'switch_blog', $blog, $blog );
                 // If we still have items in the switched stack, consider ourselves still 'switched'
-                $GLOBALS['_wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+                $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
                 return true;
         }
@@ -563 +563 @@
 
         // If we still have items in the switched stack, consider ourselves still 'switched'
-        $GLOBALS['_wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+        $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
 
         return true;
@@ -576 +576 @@
  */
 function ms_is_switched() {
-        return $GLOBALS['_wp_switched'];
+        return $GLOBALS['switched'];
 }
 

trunk/wp-includes/ms-settings.php

@@ -128 +128 @@
 $table_prefix = $wpdb->get_blog_prefix();
 $_wp_switched_stack = array();
-$_wp_switched = false;
+$switched = false;
 
 // need to init cache again after blog_id is set