Changeset 40780 for trunk/src/wp-admin/network/site-users.php

Timestamp:

05/18/2017 05:07:23 PM (7 years ago)

Author:

jeremyfelt

Message:

Multisite: Handle both role change selections in site-users.php.

Previously, a role selected below the list table would not apply on save. This aligns the behavior with wp-admin/users.php and allows role changes from both selections, deferring to the bottom selection when both are populated.

Props desrosj.
Fixes #40113.

File:

• trunk/src/wp-admin/network/site-users.php (modified) (2 diffs)

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

@@ -139 +139 @@
             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.' ) );
             }
@@ -159 +166 @@
 
                     $user = get_userdata( $user_id );
-                    $user->set_role( $_REQUEST['new_role'] );
+                    $user->set_role( $role );
                 }
             } else {