[Pkg-owncloud-commits] [owncloud] 108/394: Better place to check for user removal

[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 39a54f5abf8857f4712c4cf874356ec59f47b210
Author: Bart Visscher <bartv at thisnet.nl>
Date:   Thu Nov 15 18:10:40 2012 +0100

    Better place to check for user removal
---
 lib/user.php |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index 1a88d62..33c756f 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -204,6 +204,9 @@ class OC_User {
 			foreach(self::$_usedBackends as $backend) {
 				$backend->deleteUser($uid);
 			}
+			if (self::userExists($uid)) {
+				return false;
+			}
 			// We have to delete the user from all groups
 			foreach( OC_Group::getUserGroups( $uid ) as $i ) {
 				OC_Group::removeFromGroup( $uid, $i );
@@ -216,7 +219,7 @@ class OC_User {
 
 			// Emit and exit
 			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
-			return !self::userExists($uid);
+			return true;
 		}
 		else{
 			return false;

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