Skip to content

Apply existing patch and add tests. #13391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joedolson wants to merge 1 commit into
base: trunk
Choose a base branch
from
+40 −0
Open

Apply existing patch and add tests. #13391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/wp-admin/includes/ms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,7 @@ function confirm_delete_users( $users ) {
'include' => $blog_users,
'show' => 'display_name_with_login',
'id' => "reassign_user_{$details->userblog_id}_{$delete_user->ID}",
'blog_id' => $details->userblog_id,
)
);
?>
Expand Down
39 changes: 39 additions & 0 deletions tests/phpunit/tests/user/wpDropdownUsers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,43 @@ public function test_role__not_in() {
$this->assertStringNotContainsString( $u1->user_login, $found );
$this->assertStringContainsString( $u2->user_login, $found );
}

/**
* @ticket 66012
* @group ms-required
*/
public function test_multisite_users_in_blog_id() {
$blog_id = self::factory()->blog->create();
$users = self::factory()->user->create_many( 2 );

add_user_to_blog( $blog_id, $users[0], 'author' );
add_user_to_blog( $blog_id, $users[1], 'author' );

// The main site has no authors, so the dropdown should be empty.
$found_main_site = wp_dropdown_users(
array(
'echo' => false,
'role' => 'author',
'show' => 'user_login',
'blog_id' => get_current_blog_id(),
)
);

$this->assertSame( '', $found_main_site );

$found_sub_site = wp_dropdown_users(
array(
'echo' => false,
'role' => 'author',
'show' => 'user_login',
'blog_id' => $blog_id,
)
);

$user1 = get_userdata( $users[0] );
$user2 = get_userdata( $users[1] );

$this->assertStringContainsString( $user1->user_login, $found_sub_site );
$this->assertStringContainsString( $user2->user_login, $found_sub_site );
}
}
Loading