From 4a0e69f94180725552ed35ba9cc81eeb6a71c3aa Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Fri, 31 May 2013 11:55:40 +0200 Subject: [PATCH 1/2] fix login errors while filesystem is not loaded --- apps/files_encryption/hooks/hooks.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 955425595ba..743593d798a 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -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 From 1c4c89418bfb42017a61c71d27cc965fbb896793 Mon Sep 17 00:00:00 2001 From: Florin Peter Date: Fri, 31 May 2013 12:56:08 +0200 Subject: [PATCH 2/2] also fix login errors while filesystem is not loaded in app.php --- apps/files_encryption/appinfo/app.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index d9bb4d5e74e..99bdc2c2470 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -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);