From fef75e5417206fcc36d979022f0f9921a743a3ae Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 22 May 2015 12:12:31 +0200 Subject: remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break --- lib/private/encryption/keys/storage.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/private/encryption/keys/storage.php') diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php index 6aa00c5b5ee..f90548fd319 100644 --- a/lib/private/encryption/keys/storage.php +++ b/lib/private/encryption/keys/storage.php @@ -70,7 +70,8 @@ class Storage implements IStorage { * @inheritdoc */ public function getFileKey($path, $keyId, $encryptionModuleId) { - $keyDir = $this->getFileKeyDir($encryptionModuleId, $path); + $realFile = $this->util->stripPartialFileExtension($path); + $keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile); return $this->getKey($keyDir . $keyId); } -- cgit v1.2.3