aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-11-25 10:17:31 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-11-25 13:37:11 +0100
commit1d3350348797deeead5b02028c4ade7c874a7021 (patch)
tree7190f98b02e3a02f39a4e59cb0ebc5a95c0a40bb /apps/files
parent917bef39b7f1c0ca495ef102b7878ed5b15830c6 (diff)
downloadnextcloud-server-1d3350348797deeead5b02028c4ade7c874a7021.tar.gz
nextcloud-server-1d3350348797deeead5b02028c4ade7c874a7021.zip
we no longer need to keep the session open for encryption
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/ajax/upload.php8
1 files changed, 2 insertions, 6 deletions
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);