Changeset 15315 for trunk/wp-includes/ms-blogs.php

Timestamp:

06/24/2010 03:01:29 PM (13 years ago)

Author:

ryan

Message:

Use get_current_user() and get_current_user_id() instead of global . Props filofo. see #13934 for trunk

File:

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

trunk/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 );
     }
-
+ 
+    $current_user = wp_get_current_user();
     if ( is_object( $current_user ) )
         $current_user->for_blog( $blog_id );
@@ -431 +432 @@
 
 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 +462 @@
     }
 
+    $current_user = wp_get_current_user();
     if ( is_object( $current_user ) )
         $current_user->for_blog( $blog_id );