[Pkg-owncloud-commits] [owncloud] 107/394: Better check and handing of user deletion

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 52dd0274d34fe504d529ef9f13b7245c66b639c9
Author: Bart Visscher <bartv at thisnet.nl>
Date:   Wed Nov 14 21:45:03 2012 +0100

    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 df098d7..1a88d62 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 0f32143..bca9fea 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'));
 					}
 				}
 			});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git