Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-01-15 17:29:33 +0400
committerBjoern Schiessle <schiessle@owncloud.com>2014-01-15 18:58:56 +0400
commit3c7541e97cd3a2db3e56288062bbd9e902e77e76 (patch)
treea14fb36419d40e710b3adcb13d7280c1a2aff8f3 /apps/files_encryption/lib
parent3ec3ebb3db20c3f77abed8197554a0f1260f0981 (diff)
don't try to encrypt/decrypt cache chunks or files in the trash bin
Diffstat (limited to 'apps/files_encryption/lib')
-rw-r--r--apps/files_encryption/lib/proxy.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 96667493a51..fc48354056c 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -258,8 +258,8 @@ class Proxy extends \OC_FileProxy {
// split the path parts
$pathParts = explode('/', $path);
- // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
- if (isset($pathParts[2]) && $pathParts[2] === 'cache') {
+ // don't try to encrypt/decrypt cache chunks or files in the trash bin
+ if (isset($pathParts[2]) && ($pathParts[2] === 'cache' || $pathParts[2] === 'files_trashbin')) {
return $result;
}