golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make remove_user a meta capability. see #12793 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-03 05:14:34 +00:00
parent 69f5922799
commit c5c47b4b20
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/includes/schema.php
View File

@ -607,7 +607,6 @@ function populate_roles_300() {
if ( !empty( $role ) ) { if ( !empty( $role ) ) {
$role->add_cap( 'update_core' ); $role->add_cap( 'update_core' );
$role->add_cap( 'remove_user' );
$role->add_cap( 'remove_users' ); $role->add_cap( 'remove_users' );
} }
} }

7
wp-admin/includes/upgrade.php
View File

@ -1126,6 +1126,13 @@ function upgrade_300() {
$wpdb->update( $wpdb->postmeta, array( 'meta_key' => '_menu_item_xfn' ), array( 'meta_key' => 'menu_item_xfn' ) ); $wpdb->update( $wpdb->postmeta, array( 'meta_key' => '_menu_item_xfn' ), array( 'meta_key' => 'menu_item_xfn' ) );
$wpdb->update( $wpdb->postmeta, array( 'meta_key' => '_menu_item_url' ), array( 'meta_key' => 'menu_item_url' ) ); $wpdb->update( $wpdb->postmeta, array( 'meta_key' => '_menu_item_url' ), array( 'meta_key' => 'menu_item_url' ) );
} }
// 3.0-beta1 remove_user primitive->meta cap. can be removed before release
if ( $wp_current_db_version >= 12751 && $wp_current_db_version < 12751 ) {
$role =& get_role( 'administrator' );
if ( ! empty( $role ) )
$role->remove_cap( 'remove_user' );
}
} }
/** /**

22
wp-admin/users.php
View File

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

3
wp-includes/capabilities.php
View File

@ -796,6 +796,9 @@ function map_meta_cap( $cap, $user_id ) {
$caps = array(); $caps = array();
switch ( $cap ) { switch ( $cap ) {
case 'remove_user':
$caps[] = 'remove_users';
break;
case 'delete_user': case 'delete_user':
$caps[] = 'delete_users'; $caps[] = 'delete_users';
break; break;

2
wp-includes/version.php
View File

@ -15,7 +15,7 @@ $wp_version = '3.0-beta1';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 13803; $wp_db_version = 13956;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version