Ticket #40113: 40113.diff

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'] ] ) ) {
+                        $role = false;
+                        if ( ! empty( $_REQUEST['new_role2'] ) ) {
+                                $role = $_REQUEST['new_role2'];
+                        } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
+                                $role = $_REQUEST['new_role'];
+                        }
+
+                        if ( empty( $editable_roles[ $role ] ) ) {
                                 wp_die( __( 'Sorry, you are not allowed to give users that role.' ) );
                         }
 
@@ -158 +165 @@
                                         }
 
                                         $user = get_userdata( $user_id );
-                                        $user->set_role( $_REQUEST['new_role'] );
+                                        $user->set_role( $role );
                                 }
                         } else {
                                 $update = 'err_promote';