Merge user-edit.php and profile.php. Props nbachiyski. fixes #5736

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

wp-includes/capabilities.php

@@ -290,7 +290,9 @@ function map_meta_cap($cap, $user_id) {
 		$caps[] = 'delete_users';
 		break;
 	case 'edit_user':
-		$caps[] = 'edit_users';
+		if ( !isset($args[0]) || $user_id != $args[0] ) {
+			$caps[] = 'edit_users';
+		}
 		break;
 	case 'delete_post':
 		$author_data = get_userdata($user_id);