Changeset 15452 for branches/3.0/wp-includes/ms-blogs.php

Timestamp:

07/21/2010 08:10:22 PM (14 years ago)

Author:

ryan

Message:

Use get_current_user() and get_current_user_id() instead of global current_user object. Props filofo. fixes #13934 for 3.0.1

File:

• branches/3.0/wp-includes/ms-blogs.php (modified) (4 diffs)

branches/3.0/wp-includes/ms-blogs.php

@@ -372 +372 @@
 
 function switch_to_blog( $new_blog, $validate = false ) {
-    global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
+    global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $wp_object_cache;
 
     if ( empty($new_blog) )
@@ -407 +407 @@
         $wpdb->suppress_errors( false );
     }
-
-    if ( is_object( $current_user ) )
-        $current_user->for_blog( $blog_id );
+ 
+    if ( did_action('init') ) {
+        $current_user = wp_get_current_user();  
+        if ( is_object( $current_user ) )
+            $current_user->for_blog( $blog_id );
+    }
 
     if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
@@ -431 +434 @@
 
 function restore_current_blog() {
-    global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
+    global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $wp_object_cache;
 
     if ( !$switched )
@@ -461 +464 @@
     }
 
-    if ( is_object( $current_user ) )
-        $current_user->for_blog( $blog_id );
+    if ( did_action('init') ) {
+        $current_user = wp_get_current_user();
+        if ( is_object( $current_user ) )
+            $current_user->for_blog( $blog_id );
+    }
 
     if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )