From 987bc138df89be2d0afdf268ab5c991b1bbe830b Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 22 Apr 2015 12:12:27 +0200
Subject: calling renameKeys() on directory level as well - fixes #15778

---
 lib/private/files/storage/wrapper/encryption.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'lib/private/files')

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();
 	}
 
 }
-- 
cgit v1.2.3