From 713b3c1b82c373ab4dbc61d639e4af9741f9f443 Mon Sep 17 00:00:00 2001 From: nacin Date: Sat, 4 Sep 2010 12:24:43 +0000 Subject: [PATCH] Fix the delete_user meta cap. git-svn-id: http://svn.automattic.com/wordpress/trunk@15561 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/capabilities.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index f2c1b563f8..7d20b1e84c 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -799,9 +799,6 @@ function map_meta_cap( $cap, $user_id ) { case 'remove_user': $caps[] = 'remove_users'; break; - case 'delete_user': - $caps[] = 'delete_users'; - break; case 'promote_user': $caps[] = 'promote_users'; break; @@ -1028,10 +1025,13 @@ function map_meta_cap( $cap, $user_id ) { case 'delete_user': case 'delete_users': // If multisite these caps are allowed only for super admins. - if ( is_multisite() && !is_super_admin( $user_id ) ) + if ( is_multisite() && !is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; - else + } else { + if ( 'delete_user' == $cap ) + $cap = 'delete_users'; $caps[] = $cap; + } break; case 'create_users': if ( is_multisite() && !get_site_option( 'add_new_users' ) )