diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-05-22 16:42:52 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-05-22 16:42:52 +0200 |
| commit | ce34edacfa8fbc4f7340b4eb1ad65b35791a95e5 (patch) | |
| tree | e51e560aa4b255fd684f845fd3187aaf75db4b0e /lib | |
| parent | b82d902e184960877110bc45124ed2399f779cac (diff) | |
| parent | fef75e5417206fcc36d979022f0f9921a743a3ae (diff) | |
| download | nextcloud-server-ce34edacfa8fbc4f7340b4eb1ad65b35791a95e5.tar.gz nextcloud-server-ce34edacfa8fbc4f7340b4eb1ad65b35791a95e5.zip | |
Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload
remove part file extension before we read a filekey
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/encryption/keys/storage.php | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |