diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-03-24 17:34:37 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-03-24 17:34:37 +0100 |
| commit | e72b2e6e3be3057effd7465bf875552a5d95e9b9 (patch) | |
| tree | 07636086ab3cdc7bf5fb124cdcda7c3cba2b6f1d /apps/files | |
| parent | d87001a093f0bef132457611c531c42f6d85d732 (diff) | |
| download | nextcloud-server-e72b2e6e3be3057effd7465bf875552a5d95e9b9.tar.gz nextcloud-server-e72b2e6e3be3057effd7465bf875552a5d95e9b9.zip | |
Fix public upload to not close session when encryption is on
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/ajax/upload.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 37c600e91da..4ed51c52775 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -58,7 +58,10 @@ if (empty($_POST['dirToken'])) { OCP\JSON::callCheck(); -\OC::$session->close(); +if (!\OCP\App::isEnabled('files_encryption')) { + // encryption app need to create keys later, so can't close too early + \OC::$session->close(); +} // get array with current storage stats (e.g. max file size) |