vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-30 18:24:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make remove_user a meta capability. see #12793

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13956 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2010-04-03 05:14:34 +00:00
parent 5be7345c1b
commit 0684fcffda
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wp-admin/users.php
View File

@@ -15,9 +15,13 @@ require_once( ABSPATH . WPINC . '/registration.php');
if ( !current_user_can('edit_users') )
wp_die(__('Cheatin’ uh?'));
$del_cap_type = 'remove';
if ( !is_multisite() && current_user_can('delete_users') )
$del_cap_type = 'delete';
if ( ! is_multisite() && current_user_can('delete_users') ) {
$del_cap_user = 'delete_user';
$del_cap_users = 'delete_users';
} else {
$del_cap_user = 'remove_user';
$del_cap_users = 'remove_users';
}
$title = __('Users');
$parent_file = 'users.php';
@@ -85,16 +89,16 @@ case 'dodelete':
exit();
}
if ( !current_user_can($del_cap_type . '_users') )
wp_die(__('You can’t delete users.'));
if ( ! current_user_can($del_cap_users ) )
wp_die(__('You can’t remove users.'));
$userids = $_REQUEST['users'];
$update = 'del';
$delete_count = 0;
foreach ( (array) $userids as $id) {
if ( ! current_user_can($del_cap_type . '_user', $id) )
wp_die(__('You can’t delete that user.'));
if ( ! current_user_can( $del_cap_user, $id ) )
wp_die(__( 'You can’t remove that user.' ) );
if ( $id == $current_user->ID ) {
$update = 'err_admin_del';
@@ -132,8 +136,8 @@ case 'delete':
exit();
}
if ( !current_user_can($del_cap_type . '_users') )
$errors = new WP_Error('edit_users', __('You can’t delete users.'));
if ( ! current_user_can( $del_cap_users ) )
$errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) );
if ( empty($_REQUEST['users']) )
$userids = array(intval($_REQUEST['user']));