summaryrefslogtreecommitdiffstats
path: root/lib/private/encryption
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-22 13:09:42 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-22 13:09:42 +0200
commit225cde21830459db044d6564c7a9cf62b7dd5944 (patch)
tree7a56ae0dbb91895f191df3686267e55199672035 /lib/private/encryption
parent987bc138df89be2d0afdf268ab5c991b1bbe830b (diff)
downloadnextcloud-server-225cde21830459db044d6564c7a9cf62b7dd5944.tar.gz
nextcloud-server-225cde21830459db044d6564c7a9cf62b7dd5944.zip
pass KeyStorage via ctor
Diffstat (limited to 'lib/private/encryption')
-rw-r--r--lib/private/encryption/manager.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index 7a3f17519fc..97203b7756d 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -221,7 +221,8 @@ class Manager implements IManager {
$logger = \OC::$server->getLogger();
$uid = $user ? $user->getUID() : null;
$fileHelper = \OC::$server->getEncryptionFilesHelper();
- return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid);
+ $keyStorage = \OC::$server->getEncryptionKeyStorage();
+ return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid, $keyStorage);
} else {
return $storage;
}