diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-01-17 14:47:29 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-01-17 14:47:29 +0100 |
| commit | 5cb08bb9cb6cf603d47a124ffa0ea60881f7de51 (patch) | |
| tree | 89ac0ff4115dc175cb79b35b4df837dab3f7df45 /apps/files_encryption | |
| parent | 299bb4d99db935bb529a30fe6ae0c9bc72344d69 (diff) | |
| parent | db353e14cce316b271d3bfcfdbc6989e146d4517 (diff) | |
| download | nextcloud-server-5cb08bb9cb6cf603d47a124ffa0ea60881f7de51.tar.gz nextcloud-server-5cb08bb9cb6cf603d47a124ffa0ea60881f7de51.zip | |
Merge branch 'master' into fileinfo
Conflicts:
tests/lib/files/cache/cache.php
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml index 9d495916d26..ee05b651361 100644 --- a/apps/files_encryption/appinfo/info.xml +++ b/apps/files_encryption/appinfo/info.xml @@ -2,7 +2,7 @@ <info> <id>files_encryption</id> <name>Encryption</name> - <description>The new ownCloud 5 files encryption system. After the app was enabled you need to re-login to initialize your encryption keys.</description> + <description>The ownCloud files encryption system provides server side-encryption. After the app was enabled you need to re-login to initialize your encryption keys.</description> <licence>AGPL</licence> <author>Sam Tuke, Bjoern Schiessle, Florin Peter</author> <require>4</require> diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index c1b60799e64..0b7e066f2e2 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; } |