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
path: root/apps
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 17:29:33 +0400
commitf4179a3f5aa14c047b466dd69d6e0844091e527e (patch)
tree125c7e87194569b77826141a1f210bbfaec9cdee /apps
parentf11f65c6a5fa683e7b7d9476c7b2238ff2c1fc75 (diff)
don't try to encrypt/decrypt cache chunks or files in the trash bin
Diffstat (limited to 'apps')
-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 41f352d853a..4fe76b97711 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -255,8 +255,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;
}