Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master
we can only close the session if encryption is not used
This commit is contained in:
commit
6da9c09467
|
@ -100,7 +100,10 @@ if (isset($path)) {
|
||||||
$file = basename($path);
|
$file = basename($path);
|
||||||
// Download the file
|
// Download the file
|
||||||
if (isset($_GET['download'])) {
|
if (isset($_GET['download'])) {
|
||||||
|
if (!\OCP\App::isEnabled('files_encryption')) {
|
||||||
|
// encryption app requires the session to store the keys in
|
||||||
\OC::$server->getSession()->close();
|
\OC::$server->getSession()->close();
|
||||||
|
}
|
||||||
if (isset($_GET['files'])) { // download selected files
|
if (isset($_GET['files'])) { // download selected files
|
||||||
$files = urldecode($_GET['files']);
|
$files = urldecode($_GET['files']);
|
||||||
$files_list = json_decode($files);
|
$files_list = json_decode($files);
|
||||||
|
|
Loading…
Reference in New Issue