diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-10-15 02:44:14 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-10-15 02:44:14 -0700 |
| commit | 52501d6ba3da5596975a945ba00ea753f6c7f4e7 (patch) | |
| tree | 17683180adfb81a3a5d37ddc302e51f823039c61 /apps | |
| parent | a6d9319328d7379dbd1505de11f75c046deaba0f (diff) | |
| parent | d3af7a9aa47c99116badc3ab2546d04abc1edf6e (diff) | |
| download | nextcloud-server-52501d6ba3da5596975a945ba00ea753f6c7f4e7.tar.gz nextcloud-server-52501d6ba3da5596975a945ba00ea753f6c7f4e7.zip | |
Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files
check if we are writing to user/files, otherwise skip encryption
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 8621c1ba51d..04795b35670 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -47,7 +47,8 @@ class Proxy extends \OC_FileProxy { */ private static function shouldEncrypt($path) { - if (\OCP\App::isEnabled('files_encryption') === false || Crypt::mode() !== 'server') { + if (\OCP\App::isEnabled('files_encryption') === false || Crypt::mode() !== 'server' || + strpos($path, '/' . \OCP\User::getUser() . '/files') !== 0) { return false; } |