Changeset 15331

Timestamp:

06/25/2010 04:16:06 PM (16 years ago)

Author:

ryan

Message:

Don't perform current user ops in switch_to_blog() or restore_current_blog() if init hasn't fired. Avoids wp_get_current_user() not defined error when those functions are run before init. Ops on current user prior to init are meaningless anyway. see #13934

File:

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

trunk/wp-includes/ms-blogs.php

@@ -408 +408 @@
         }
  
-        $current_user = wp_get_current_user();
-        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 ) )
@@ -462 +464 @@
         }
 
-        $current_user = wp_get_current_user();
-        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 ) )