diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-22 12:12:27 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-22 12:12:27 +0200 |
| commit | 987bc138df89be2d0afdf268ab5c991b1bbe830b (patch) | |
| tree | 3609a0bc92a02131bde870974bd3198fa6e17c63 /lib | |
| parent | fc4127dd62bdd1d9bd9339797607615a250ba33f (diff) | |
| download | nextcloud-server-987bc138df89be2d0afdf268ab5c991b1bbe830b.tar.gz nextcloud-server-987bc138df89be2d0afdf268ab5c991b1bbe830b.zip | |
calling renameKeys() on directory level as well - fixes #15778
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 10 |
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(); } } |