summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-08-07 11:07:11 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-08-07 11:07:11 +0200
commit2fb8fcf6cbb41da91b163f8f97327f80fe360145 (patch)
treee1b1efe00e56c6c8bdbde2c44828781d27deea8d /apps
parent2821f7241b1d36db0c74ca1111496f7dbd50080c (diff)
downloadnextcloud-server-2fb8fcf6cbb41da91b163f8f97327f80fe360145.tar.gz
nextcloud-server-2fb8fcf6cbb41da91b163f8f97327f80fe360145.zip
we can only close the session if encryption is not used
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/public.php5
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);