Ticket #38356: 38356.diff
File 38356.diff, 1.6 KB (added by , 7 years ago) |
---|
-
src/wp-includes/ms-functions.php
161 161 162 162 if ( !get_user_meta($user_id, 'primary_blog', true) ) { 163 163 update_user_meta($user_id, 'primary_blog', $blog_id); 164 $ details = get_blog_details($blog_id);165 update_user_meta($user_id, 'source_domain', $ details->domain);164 $site = get_site( $blog_id ); 165 update_user_meta($user_id, 'source_domain', $site->domain); 166 166 } 167 167 168 168 $user->set_role($role); -
tests/phpunit/tests/user/multisite.php
365 365 $this->assertFalse( wpmu_delete_user( $u_obj ) ); 366 366 $this->assertEquals( $u_obj->ID, username_exists( $u_obj->user_login ) ); 367 367 } 368 369 /** 370 * @ticket 38356 371 */ 372 public function test_add_user_to_blog_subscriber() { 373 $site_id = self::factory()->blog->create(); 374 $user_id = self::factory()->user->create(); 375 376 add_user_to_blog( $user_id, $site_id, 'subscriber' ); 377 378 switch_to_blog( $site_id ); 379 $user = get_user_by( 'id', $user_id ); 380 restore_current_blog(); 381 382 $this->assertContains( 'subscriber', $user->roles ); 383 } 384 385 /** 386 * @ticket 38356 387 */ 388 public function test_add_user_to_blog_invalid_user() { 389 $site_id = self::factory()->blog->create(); 390 391 $result = add_user_to_blog( 73622, $site_id, 'subscriber' ); 392 $this->assertWPError( $result ); 393 } 368 394 } 369 395 370 396 endif ;