Changeset 13956

Timestamp:

04/03/2010 05:14:34 AM (15 years ago)

Author:

nacin

Message:

Make remove_user a meta capability. see #12793

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/users.php (modified) (4 diffs)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -608 +608 @@
     if ( !empty( $role ) ) {
         $role->add_cap( 'update_core' );
-        $role->add_cap( 'remove_user' );
         $role->add_cap( 'remove_users' );
     }

trunk/wp-admin/includes/upgrade.php

@@ -1126 +1126 @@
         $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' ) );
+    }
+
+    // 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' );
     }
 }

trunk/wp-admin/users.php

@@ -16 +16 @@
     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');
@@ -86 +90 @@
     }
 
-    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'];
@@ -94 +98 @@
 
     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 ) {
@@ -133 +137 @@
     }
 
-    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']) )

trunk/wp-includes/capabilities.php

@@ -797 +797 @@
 
     switch ( $cap ) {
+    case 'remove_user':
+        $caps[] = 'remove_users';
+        break;
     case 'delete_user':
         $caps[] = 'delete_users';

trunk/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 13803;
+$wp_db_version = 13956;
 
 /**