diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-07 11:07:11 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-07 14:32:18 +0200 |
| commit | 8f8923a714b1433b90ce7f74e5adc45645cac1de (patch) | |
| tree | bf691d790ce48a8c767ac680fdadc966cf798525 /apps | |
| parent | 9ba8f5b60480e8dc30cc0e6e24c61d80871b254d (diff) | |
| download | nextcloud-server-8f8923a714b1433b90ce7f74e5adc45645cac1de.tar.gz nextcloud-server-8f8923a714b1433b90ce7f74e5adc45645cac1de.zip | |
we can only close the session if encryption is not used
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/public.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index e64a1f7b127..c92d3fc4007 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -100,7 +100,10 @@ if (isset($path)) { $file = basename($path); // Download the file if (isset($_GET['download'])) { - \OC::$server->getSession()->close(); + if (!\OCP\App::isEnabled('files_encryption')) { + // encryption app requires the session to store the keys in + \OC::$server->getSession()->close(); + } if (isset($_GET['files'])) { // download selected files $files = urldecode($_GET['files']); $files_list = json_decode($files); |