Ticket #40113: 40113.patch

src/wp-admin/network/site-users.php

@@ -138 +138 @@
                 case 'promote':
                         check_admin_referer( 'bulk-users' );
                         $editable_roles = get_editable_roles();
-                        if ( empty( $editable_roles[ $_REQUEST['new_role'] ] ) ) {
+                        if ( empty( $editable_roles[ $_REQUEST['new_role'] ] ) && empty( $editable_roles[ $_REQUEST['new_role2'] ] ) ) {
                                 wp_die( __( 'Sorry, you are not allowed to give users that role.' ) );
                         }
 
                         if ( isset( $_REQUEST['users'] ) ) {
                                 $userids = $_REQUEST['users'];
                                 $update = 'promote';
+
+                                $new_role = false;
+                                if ( ! empty( $_REQUEST['new_role2'] ) ) {
+                                        $new_role = $_REQUEST['new_role2'];
+                                } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
+                                        $new_role = $_REQUEST['new_role'];
+                                }
+
                                 foreach ( $userids as $user_id ) {
                                         $user_id = (int) $user_id;