diff options
author | Vincent Petry <pvince81@owncloud.com> | 2016-05-24 11:41:09 +0300 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-24 11:41:09 +0300 |
commit | 3d4f29f6224162067065bee20069176bab9083e4 (patch) | |
tree | d1683f27358299b30d60a015a1e96bb029b5e25f | |
parent | 64ec70a70f3864b955d71616982f7e28abf23b5a (diff) | |
parent | 6c797eed82e0b03b497103c9dd5bc747b1d951be (diff) |
Merge pull request #24417 from owncloud/fix_24182_9.0
[stable9] first call the post_login hooks, before we call getUserFolder.
-rw-r--r-- | lib/private/user.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/user.php b/lib/private/user.php index 26062f503d2..604fd8674b1 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -203,8 +203,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; } |