X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/96bc8e88cf39086a9e0a883b8e2c311fe82a5e97..refs/tags/wordpress-3.3.1-scripts:/wp-includes/user.php

diff --git a/wp-includes/user.php b/wp-includes/user.php
index c4edb184..2b0508fa 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -696,7 +696,7 @@ function get_blogs_of_user( $user_id, $all = false ) {
 	foreach ( $keys as $key ) {
 		if ( 'capabilities' !== substr( $key, -12 ) )
 			continue;
-		if ( 0 !== strpos( $key, $wpdb->base_prefix ) )
+		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
 			continue;
 		$blog_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
 		if ( ! is_numeric( $blog_id ) )
@@ -931,7 +931,7 @@ function setup_userdata($for_user_id = '') {
 	else
 		$user = new WP_User($for_user_id);
 
-	$userdata   = $user->data;
+	$userdata   = $user;
 	$user_ID    = (int) $user->ID;
 	$user_level = (int) isset($user->user_level) ? $user->user_level : 0;