WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disallow and hide user removal (as opposed to deletion) for single site installs. Removal is a multisite concept. Props nacin. fixes #16501 for 3.1 

git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-02-10 20:38:04 +00:00
parent 0b2f08609e
commit 8dd892a91b
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/includes/class-wp-users-list-table.php
View File

@ -121,10 +121,13 @@ class WP_Users_List_Table extends WP_List_Table {
function get_bulk_actions() { function get_bulk_actions() {
$actions = array(); $actions = array();
if ( !is_multisite() && current_user_can( 'delete_users' ) ) if ( is_multisite() ) {
$actions['delete'] = __( 'Delete' ); if ( current_user_can( 'remove_users' ) )
else $actions['remove'] = __( 'Remove' );
$actions['remove'] = __( 'Remove' ); } else {
if ( current_user_can( 'delete_users' ) )
$actions['delete'] = __( 'Delete' );
}
return $actions; return $actions;
} }

10
wp-admin/users.php
View File

@ -200,13 +200,16 @@ break;
case 'doremove': case 'doremove':
check_admin_referer('remove-users'); check_admin_referer('remove-users');
if ( ! is_multisite() )
wp_die( __( 'You can’t remove users.' ) );
if ( empty($_REQUEST['users']) ) { if ( empty($_REQUEST['users']) ) {
wp_redirect($redirect); wp_redirect($redirect);
exit; exit;
} }
if ( !current_user_can('remove_users') ) if ( ! current_user_can( 'remove_users' ) )
die(__('You can’t remove users.')); wp_die( __( 'You can’t remove users.' ) );
$userids = $_REQUEST['users']; $userids = $_REQUEST['users'];
@ -234,6 +237,9 @@ case 'remove':
check_admin_referer('bulk-users'); check_admin_referer('bulk-users');
if ( ! is_multisite() )
wp_die( __( 'You can’t remove users.' ) );
if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) { if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
wp_redirect($redirect); wp_redirect($redirect);
exit(); exit();