From 077d41a9ce2419c4bfd1ab5863672386e0cf761a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 5 May 2015 17:16:13 +0200 Subject: [PATCH] wait with copying the skeleton untill login and setupfs are done --- lib/private/user.php | 5 ++++- lib/private/util.php | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/private/user.php b/lib/private/user.php index b3677233825..2192cbba322 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -241,7 +241,10 @@ class OC_User { $result = self::getUserSession()->login($loginname, $password); if ($result) { //we need to pass the user name, which may differ from login name - OC_Util::setupFS(self::getUserSession()->getUser()->getUID()); + $user = self::getUserSession()->getUser()->getUID(); + OC_Util::setupFS($user); + //trigger creation of user home and /files folder + \OC::$server->getUserFolder($user); } return $result; } diff --git a/lib/private/util.php b/lib/private/util.php index 367199f7735..83c92326f8c 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -189,9 +189,6 @@ class OC_Util { //jail the user into his "home" directory \OC\Files\Filesystem::init($user, $userDir); - //trigger creation of user home and /files folder - \OC::$server->getUserFolder($user); - OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir)); } \OC::$server->getEventLogger()->end('setup_fs');