summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2013-10-28 19:15:36 +0100
committerFrank Karlitschek <frank@owncloud.org>2013-10-28 19:15:36 +0100
commitbe9a5dc316bc11a83eb7d394ea96a84b0f1129b5 (patch)
tree62d5416ee7716b02c6c79c71abdebb9e082e1eb3 /lib/private
parentc3b48c69db0c84518897798f8bc78518e0ed6909 (diff)
parentffc3bc19146bbdd8c3ba03a9dfa4bb06aa5f8b7f (diff)
downloadnextcloud-server-6.0.0beta2.tar.gz
nextcloud-server-6.0.0beta2.zip
Merge branch 'master' of https://github.com/owncloud/corev6.0.0beta2
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/user.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/user.php b/lib/private/user.php
index 710f0fd66db..f15fdf1dbbc 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -195,12 +195,12 @@ class OC_User {
// We have to delete the user from all groups
foreach (OC_Group::getUserGroups($uid) as $i) {
OC_Group::removeFromGroup($uid, $i);
- }
+ }
// Delete the user's keys in preferences
- OC_Preferences::deleteUser($uid);
+ OC_Preferences::deleteUser($uid);
// Delete user files in /data/
- OC_Helper::rmdirr(OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid . '/');
+ OC_Helper::rmdirr(\OC_User::getHome($uid));
// Remove it from the Cache
self::getManager()->delete($uid);