Separate user deletion and removal. Add promote_users cap so that multisite Admins (not supes) can promote. see #13074

git-svn-id: http://svn.automattic.com/wordpress/trunk@14176 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/capabilities.php

@@ -802,6 +802,9 @@ function map_meta_cap( $cap, $user_id ) {
 	case 'delete_user':
 		$caps[] = 'delete_users';
 		break;
+	case 'promote_user':
+		$caps[] = 'promote_users';
+		break;
 	case 'edit_user':
 		if ( !isset( $args[0] ) || $user_id != $args[0] ) {
 			$caps[] = 'edit_users';