Changes from trunk/wp-includes/user.php at r19209 to branches/3.3/wp-includes/user.php at r19643

File:

• branches/3.3/wp-includes/user.php (modified) (2 diffs)

branches/3.3/wp-includes/user.php

@@ -697 +697 @@
         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 );
@@ -932 +932 @@
         $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;