From 523e292d8cc61588f52841b19b22672b9c0e949c Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 5 Feb 2021 14:40:08 +0000
Subject: [PATCH] Users: Allow the role of users to be bulk changed to no role
 from the Users listing screen.

This option is already available when editing an individual user, but it was previously missing from the bulk actions.

Props bonniebeeman, sabernhardt, ovidiul, jeroenrotty

Fixes #52238

Built from https://develop.svn.wordpress.org/trunk@50228


git-svn-id: http://core.svn.wordpress.org/trunk@49889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-users-list-table.php | 1 +
 wp-admin/users.php                              | 9 +++++++++
 wp-includes/version.php                         | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index bf73df9e99..e78fa20312 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -300,6 +300,7 @@ class WP_Users_List_Table extends WP_List_Table {
 		<select name="<?php echo $id; ?>" id="<?php echo $id; ?>">
 			<option value=""><?php _e( 'Change role to&hellip;' ); ?></option>
 			<?php wp_dropdown_roles(); ?>
+			<option value="none"><?php echo __( '&mdash; No role for this site &mdash;' ) ?> </option>
 		</select>
 			<?php
 			submit_button( __( 'Change' ), '', $button_id, false );
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 87bfe90cf8..c76f21805f 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -114,10 +114,19 @@ switch ( $wp_list_table->current_action() ) {
 		$editable_roles = get_editable_roles();
 		$role           = $_REQUEST['new_role'];
 
+		// Mocking the `none` role so we are able to save it to the database
+		$editable_roles['none'] = array(
+			'name' => __( '&mdash; No role for this site &mdash;' ),
+		);
+
 		if ( ! $role || empty( $editable_roles[ $role ] ) ) {
 			wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
 		}
 
+		if ( 'none' === $role ) {
+			$role = '';
+		}
+
 		$userids = $_REQUEST['users'];
 		$update  = 'promote';
 		foreach ( $userids as $id ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 40a2560934..dd1e86fc45 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-beta1-50192';
+$wp_version = '5.7-beta1-50228';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.