Ticket #38356: 38356.diff

src/wp-includes/ms-functions.php

@@ -161 +161 @@
 
         if ( !get_user_meta($user_id, 'primary_blog', true) ) {
                 update_user_meta($user_id, 'primary_blog', $blog_id);
-                $details = get_blog_details($blog_id);
-                update_user_meta($user_id, 'source_domain', $details->domain);
+                $site = get_site( $blog_id );
+                update_user_meta($user_id, 'source_domain', $site->domain);
         }
 
         $user->set_role($role);

tests/phpunit/tests/user/multisite.php

@@ -365 +365 @@
                 $this->assertFalse( wpmu_delete_user( $u_obj ) );
                 $this->assertEquals( $u_obj->ID, username_exists( $u_obj->user_login ) );
         }
+
+        /**
+         * @ticket 38356
+         */
+        public function test_add_user_to_blog_subscriber() {
+                $site_id = self::factory()->blog->create();
+                $user_id = self::factory()->user->create();
+
+                add_user_to_blog( $user_id, $site_id, 'subscriber' );
+
+                switch_to_blog( $site_id );
+                $user = get_user_by( 'id', $user_id );
+                restore_current_blog();
+
+                $this->assertContains( 'subscriber', $user->roles );
+        }
+
+        /**
+         * @ticket 38356
+         */
+        public function test_add_user_to_blog_invalid_user() {
+                $site_id = self::factory()->blog->create();
+
+                $result = add_user_to_blog( 73622, $site_id, 'subscriber' );
+                $this->assertWPError( $result );
+        }
 }
 
 endif ;