Changeset 16179

Timestamp:

11/04/2010 09:31:58 AM (16 years ago)

Author:

westi

Message:

Don't mangle the primary_blog option when trying to fix it. Don't set people to be a subscriber on a blog they already have a role for. See #15316

File:

• trunk/wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-includes/ms-functions.php

@@ -80 +80 @@
         $primary_blog = get_user_meta( $user_id, 'primary_blog', true );
         $first_blog = current($blogs);
-        if ( $primary_blog ) {
+        if ( false !== $primary_blog ) {
                 if ( ! isset( $blogs[ $primary_blog ] ) ) {
-                        add_user_to_blog( $first_blog->blog_id, $user_id, 'subscriber' );
-                        update_user_meta( $user_id, 'primary_blog', $first_blog->blog_id );
+                        update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
                         $primary = $first_blog;
                 } else {
@@ -89 +88 @@
                 }
         } else {
-                add_user_to_blog( $first_blog->blog_id, $user_id, 'subscriber' );
-                update_user_meta( $user_id, 'primary_blog', $first_blog->blog_id );
+                //TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
+                add_user_to_blog( $first_blog->userblog_id, $user_id, 'subscriber' );
+                update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
                 $primary = $first_blog;
         }