From 1d3350348797deeead5b02028c4ade7c874a7021 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 25 Nov 2014 10:17:31 +0100
Subject: we no longer need to keep the session open for encryption

---
 apps/files/ajax/upload.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'apps/files/ajax/upload.php')

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index b960e02ced7..aeb0008a7b9 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -1,5 +1,7 @@
 <?php
 
+\OC::$server->getSession()->close();
+
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
@@ -64,13 +66,7 @@ if (empty($_POST['dirToken'])) {
 	}
 }
 
-
 OCP\JSON::callCheck();
-if (!\OCP\App::isEnabled('files_encryption')) {
-	// encryption app need to create keys later, so can't close too early
-	\OC::$server->getSession()->close();
-}
-
 
 // get array with current storage stats (e.g. max file size)
 $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
-- 
cgit v1.2.3