diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-25 12:43:26 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-25 12:43:26 +0100 |
| commit | 36c9d91f86bc893f1f2d782b1aa3e314cda7f3a2 (patch) | |
| tree | bf7e0e67e40e42c3706f1eeb82e2b970738cc38c | |
| parent | 531c9564b3ec848f1869f57bccb41c6c529749b5 (diff) | |
| parent | e72b2e6e3be3057effd7465bf875552a5d95e9b9 (diff) | |
| download | nextcloud-server-36c9d91f86bc893f1f2d782b1aa3e314cda7f3a2.tar.gz nextcloud-server-36c9d91f86bc893f1f2d782b1aa3e314cda7f3a2.zip | |
Merge pull request #7867 from owncloud/upload-dontclosesessionforencryption
Fix public upload to not close session when encryption is on
| -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) |