Wordpress 3.3.1-scripts

[autoinstalls/wordpress.git] / wp-includes / user.php

diff --git a/wp-includes/user.php b/wp-includes/user.php
index c4edb184863b65445ba22a96010a613f8cad1945..2b0508fad8dc17be0a2a15fe3ef298571bb0324f 100644 (file)
--- 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;
        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 ) )
                        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);
 
        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;
 
        $user_ID    = (int) $user->ID;
        $user_level = (int) isset($user->user_level) ? $user->user_level : 0;