[Pkg-owncloud-commits] [owncloud] 31/121: we can only close the session if encryption is not used

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 8f8923a714b1433b90ce7f74e5adc45645cac1de
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Aug 7 11:07:11 2014 +0200

    we can only close the session if encryption is not used
---
 apps/files_sharing/public.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index e64a1f7..c92d3fc 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git