Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix
fix login errors while filesystem is not loaded
This commit is contained in:
commit
35e83f8fed
2 changed files with 11 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue