summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2012-11-15 14:01:16 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2012-11-15 14:01:16 -0800
commit36bf4e24f0ea910ce504a5756279f9f73619694d (patch)
treede36a07c7c979bf4efd7f4e75cfa538a29853dad /lib
parent8a93cc14f66b6d2d725ae52ce0bf632a03fac59d (diff)
parent9419913c06bc0fc7795243d9a9f8800f5e2a7ac4 (diff)
downloadnextcloud-server-36bf4e24f0ea910ce504a5756279f9f73619694d.tar.gz
nextcloud-server-36bf4e24f0ea910ce504a5756279f9f73619694d.zip
Merge pull request #433 from owncloud/user_setting_fixes
User setting fixes
Diffstat (limited to 'lib')
-rw-r--r--lib/user.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/user.php b/lib/user.php
index 801ab7f608d..31c93740d77 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -182,7 +182,7 @@ class OC_User {
$backend->createUser($uid, $password);
OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password ));
- return true;
+ return self::userExists($uid);
}
}
return false;
@@ -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 );