summaryrefslogtreecommitdiffstats
path: root/lib/private/user.php
diff options
context:
space:
mode:
authorChristoph Wurst <ChristophWurst@users.noreply.github.com>2016-06-01 12:04:26 +0200
committerChristoph Wurst <ChristophWurst@users.noreply.github.com>2016-06-01 12:04:26 +0200
commit0d5f56b465257e4b1d9e4e857123b55ae524654f (patch)
tree4d82f2af3d3f8ccf7f586c6dedfaa8b665426c62 /lib/private/user.php
parentc1257761f12d6483fad5d3633879f86b9c74d416 (diff)
parentd9163c29f3a6cff344a3a43d07fb168b832d51f0 (diff)
downloadnextcloud-server-0d5f56b465257e4b1d9e4e857123b55ae524654f.tar.gz
nextcloud-server-0d5f56b465257e4b1d9e4e857123b55ae524654f.zip
Merge pull request #24418 from owncloud/fix_24182_8.2
[stable8.2] first call the post_login hooks, before we call getUserFolder.
Diffstat (limited to 'lib/private/user.php')
-rw-r--r--lib/private/user.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/user.php b/lib/private/user.php
index 86b1385f15d..7c839e6a4c8 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -287,8 +287,16 @@ class OC_User {
self::setUserId($uid);
self::setDisplayName($uid);
self::getUserSession()->setLoginName($uid);
-
+ // setup the filesystem
+ OC_Util::setupFS($uid);
+ // first call the post_login hooks, the login-process needs to be
+ // completed before we can safely create the users folder.
+ // For example encryption needs to initialize the users keys first
+ // before we can create the user folder with the skeleton files
OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+ //trigger creation of user home and /files folder
+ \OC::$server->getUserFolder($uid);
+
}
return true;
}