diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-07 14:29:54 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-07 14:29:54 +0200 |
| commit | 6da9c09467f5162a957914bd836cc4b157591e51 (patch) | |
| tree | 4962962be69d07b5980e879a1fb8000789e593e6 /apps | |
| parent | f1091280de5bca203e3233206e75c0c7421065c1 (diff) | |
| parent | 2fb8fcf6cbb41da91b163f8f97327f80fe360145 (diff) | |
| download | nextcloud-server-6da9c09467f5162a957914bd836cc4b157591e51.tar.gz nextcloud-server-6da9c09467f5162a957914bd836cc4b157591e51.zip | |
Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master
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); |