diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-05-18 14:59:34 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-05-18 14:59:34 +0200 |
| commit | 86cf8e1f689db6e6781c78eae9a057c7d9548c0a (patch) | |
| tree | 5a7ac649e04e090eb5be27df67ad56a188162554 /apps/encryption/lib/crypto | |
| parent | 85f500f07037cab21757fffcae7a5cd78db43bd1 (diff) | |
| parent | 7d492fefae25ce11944ac611229eb3a949908e55 (diff) | |
| download | nextcloud-server-86cf8e1f689db6e6781c78eae9a057c7d9548c0a.tar.gz nextcloud-server-86cf8e1f689db6e6781c78eae9a057c7d9548c0a.zip | |
Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
also encrypt files in trash bin
Diffstat (limited to 'apps/encryption/lib/crypto')
| -rw-r--r-- | apps/encryption/lib/crypto/encryption.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index 0fd85fa4e9a..c060bb04e53 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -330,7 +330,7 @@ class Encryption implements IEncryptionModule { */ public function shouldEncrypt($path) { $parts = explode('/', $path); - if (count($parts) < 3) { + if (count($parts) < 4) { return false; } @@ -340,6 +340,9 @@ class Encryption implements IEncryptionModule { if ($parts[2] == 'files_versions') { return true; } + if ($parts[2] == 'files_trashbin') { + return true; + } return false; } |