From 52dd0274d34fe504d529ef9f13b7245c66b639c9 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 14 Nov 2012 21:45:03 +0100
Subject: [PATCH] Better check and handing of user deletion

---
 lib/user.php         | 2 +-
 settings/js/users.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index df098d776b4..1a88d623855 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -216,7 +216,7 @@ class OC_User {
 
 			// Emit and exit
 			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
-			return true;
+			return !self::userExists($uid);
 		}
 		else{
 			return false;
diff --git a/settings/js/users.js b/settings/js/users.js
index 0f32143d886..bca9fea839c 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -59,6 +59,8 @@ var UserList={
 						if (ready) {
 							ready();
 						}
+					} else {
+						oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
 					}
 				}
 			});