Skip to content
Snippets Groups Projects
Commit 35e83f8f authored by Florin Peter's avatar Florin Peter
Browse files

Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix

fix login errors while filesystem is not loaded
parents d636e168 1c4c8941
Branches
No related tags found
No related merge requests found
......@@ -25,6 +25,12 @@ stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
// check if we are logged in
if (OCP\User::isLoggedIn()) {
// ensure filesystem is loaded
if(!\OC\Files\Filesystem::$loaded) {
\OC_Util::setupFS();
}
$view = new OC_FilesystemView('/');
$session = new \OCA\Encryption\Session($view);
......
......@@ -46,6 +46,11 @@ class Hooks {
$view = new \OC_FilesystemView('/');
// ensure filesystem is loaded
if(!\OC\Files\Filesystem::$loaded) {
\OC_Util::setupFS($params['uid']);
}
$util = new Util($view, $params['uid']);
// setup user, if user not ready force relogin
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment