diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2016-05-04 10:23:38 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2016-05-04 10:23:38 +0200 |
| commit | 61be98f554d83de3fbd76ce0772c48cb95ec1327 (patch) | |
| tree | 3d42a25bbd92493a63a38f3b0a48c56a9f2fbff5 /lib/private | |
| parent | cd7f4ed96f40521eb358f09d27bdb88c00dee074 (diff) | |
| parent | 8c0984d605361be7cf200257900a89685ee8f3da (diff) | |
| download | nextcloud-server-61be98f554d83de3fbd76ce0772c48cb95ec1327.tar.gz nextcloud-server-61be98f554d83de3fbd76ce0772c48cb95ec1327.zip | |
Merge pull request #24410 from owncloud/fix_24182
first call the post_login hooks, before we call getUserFolder.
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/legacy/user.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index 18a4c369d5e..f0e829bbe33 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -212,10 +212,13 @@ class OC_User { 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); - - OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => '')); } return true; } |