diff options
author | Florin Peter <github@florin-peter.de> | 2013-05-31 20:34:43 +0200 |
---|---|---|
committer | Florin Peter <github@florin-peter.de> | 2013-05-31 20:34:43 +0200 |
commit | 8761242f5240319e234c9fa3020141e9791cdcfb (patch) | |
tree | a0f2e6b080f276826cb54963e484449288587fb8 /apps/files_encryption/hooks | |
parent | 1bfe975938e96f462afe5ef5e5ebc75735767711 (diff) | |
parent | eafb241068c9d2ca591e37580722101ea548ef88 (diff) | |
download | nextcloud-server-8761242f5240319e234c9fa3020141e9791cdcfb.tar.gz nextcloud-server-8761242f5240319e234c9fa3020141e9791cdcfb.zip |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/appinfo/app.php
Diffstat (limited to 'apps/files_encryption/hooks')
-rw-r--r-- | apps/files_encryption/hooks/hooks.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 02602989087..f823999dcb0 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
|