summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-30 14:14:31 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-30 14:14:31 +0200
commit42097bfc6a49e35c562f8c19ee078299f67ff3e5 (patch)
treefc02f4b0218142e366bfbe4c1d9553aea48ae6ae
parentd308ec4f0ea54e8cb0c99228a480da8cb7cf30a8 (diff)
parentd0ad69aa9cfd68f81f47dfb785b2f5aad4ae29f8 (diff)
downloadnextcloud-server-42097bfc6a49e35c562f8c19ee078299f67ff3e5.tar.gz
nextcloud-server-42097bfc6a49e35c562f8c19ee078299f67ff3e5.zip
Merge pull request #15968 from owncloud/enc-wrapper-presetup
use the preSetup hook to ensure the encryption wrapper is applied correctly
-rw-r--r--lib/base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index 7e6183520e1..ec875480662 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -712,7 +712,7 @@ class OC {
}
private static function registerEncryptionWrapper() {
- \OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC\Encryption\Manager', 'setupStorage');
+ \OCP\Util::connectHook('OC_Filesystem', 'preSetup', 'OC\Encryption\Manager', 'setupStorage');
}
private static function registerEncryptionHooks() {