Better check and handing of user deletion

diff --git a/lib/user.php b/lib/user.php
index df098d776b40370138674694ab698b514c2943c9..1a88d623855c7c35f3754e96df57a529e6a8b21d 100644 (file)
--- 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 0f32143d886483c752c67b4d046c2a1c25995145..bca9fea839cb691c325c6fcbfc90585177c44443 100644 (file)
--- 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'));
                                        }
                                }
                        });