summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-20 12:34:23 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-20 12:34:23 +0100
commitf3e2a63712e3306c5bb1cad1921da4a3ff542474 (patch)
tree5595b71dbc2477b2ff1c5d846b3ef660927c4e87 /apps
parent0c24c7c4203071542d1f1acc447bb6c6b18148db (diff)
downloadnextcloud-server-f3e2a63712e3306c5bb1cad1921da4a3ff542474.tar.gz
nextcloud-server-f3e2a63712e3306c5bb1cad1921da4a3ff542474.zip
check if it is a cached file or a version to resolve the correct path to the file key
Diffstat (limited to 'apps')
-rw-r--r--apps/files_encryption/lib/util.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 4f27c2b00fb..b208a808bac 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -472,7 +472,11 @@ class Util {
*/
public function isEncryptedPath($path) {
- $relPath = Helper::stripUserFilesPath($path);
+ $relPath = Helper::getPathToRealFile($path);
+
+ if ($relPath === false) {
+ $relPath = Helper::stripUserFilesPath($path);
+ }
$fileKey = Keymanager::getFileKey($this->view, $relPath);