Ticket #38355: 38355.diff

wp-includes/ms-functions.php

@@ -53 +53 @@
         if ( false !== $primary_blog ) {
                 if ( ! isset( $blogs[ $primary_blog ] ) ) {
                         update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
-                        $primary = get_blog_details( $first_blog->userblog_id );
+                        $primary = get_site( $first_blog->userblog_id );
                 } else {
-                        $primary = get_blog_details( $primary_blog );
+                        $primary = get_site( $primary_blog );
                 }
         } else {
                 //TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
@@ -71 +71 @@
                         foreach ( (array) $blogs as $blog_id => $blog ) {
                                 if ( $blog->site_id != $wpdb->siteid )
                                         continue;
-                                $details = get_blog_details( $blog_id );
+                                $details = get_site( $blog_id );
                                 if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
                                         $ret = $blog;
                                         if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )