IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Users List Table: show the "Change role to" dropdown on the top and bottom. Currently only shows on top.

Browse Source 
See #27743.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor
2015-09-27 19:11:26 +00:00
parent 9c46736476
commit f78170934a
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/users.php
View File

@@ -95,8 +95,16 @@ case 'promote':
}
$editable_roles = get_editable_roles();
if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
wp_die(__('You can’t give users that role.'));
$role = false;
if ( ! empty( $_REQUEST['new_role2'] ) ) {
$role = $_REQUEST['new_role2'];
} elseif ( ! empty( $_REQUEST['new_role'] ) ) {
$role = $_REQUEST['new_role'];
}
if ( ! $role || empty( $editable_roles[ $role ] ) ) {
wp_die( __( 'You can’t give users that role.' ) );
}
$userids = $_REQUEST['users'];
$update = 'promote';
@@ -106,7 +114,7 @@ case 'promote':
if ( ! current_user_can('promote_user', $id) )
wp_die(__('You can’t edit that user.'));
// The new role of the current user must also have the promote_users cap or be a multisite super admin
if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap('promote_users')
&& ! ( is_multisite() && is_super_admin() ) ) {
$update = 'err_admin_role';
continue;
@@ -122,7 +130,7 @@ case 'promote':
}
$user = get_userdata( $id );
$user->set_role($_REQUEST['new_role']);
$user->set_role( $role );
}
wp_redirect(add_query_arg('update', $update, $redirect));