Index: wp-includes/ms-settings.php
===================================================================
--- wp-includes/ms-settings.php	(revision 14580)
+++ wp-includes/ms-settings.php	(working copy)
@@ -48,7 +48,8 @@
 	$path = str_replace ( '/wp-admin/', '/', $path );
 	$path = preg_replace( '|(/[a-z0-9-]+?/).*|', '$1', $path );
 
-	$current_site = wpmu_current_site();
+	$current_site = new StdClass(); 
+	wpmu_current_site();
 	if ( ! isset( $current_site->blog_id ) )
 		$current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );