summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/storage/wrapper/encryption.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 14c9df9c6f7..04eb5fceedd 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -215,11 +215,8 @@ class Encryption extends Wrapper {
if (isset($this->unencryptedSize[$source])) {
$this->unencryptedSize[$target] = $this->unencryptedSize[$source];
}
- $encryptionModule = $this->getEncryptionModule($path2);
- if ($encryptionModule) {
- $keyStorage = $this->getKeyStorage($encryptionModule->getId());
- $keyStorage->renameKeys($source, $target);
- }
+ $keyStorage = $this->getKeyStorage();
+ $keyStorage->renameKeys($source, $target);
}
return $result;
@@ -438,8 +435,7 @@ class Encryption extends Wrapper {
* @return \OCP\Encryption\Keys\IStorage
*/
protected function getKeyStorage() {
- $keyStorage = \OC::$server->getEncryptionKeyStorage();
- return $keyStorage;
+ return \OC::$server->getEncryptionKeyStorage();
}
}