From 343e9d86213edb832455338816527e9cbab0d6e0 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 872fff9b2d9..a60ebbe4423 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 91be1a44385..517984f9247 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'));
 					}
 				}
 			});
-- 
2.39.5