diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-25 10:17:31 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-25 13:37:11 +0100 |
| commit | 1d3350348797deeead5b02028c4ade7c874a7021 (patch) | |
| tree | 7190f98b02e3a02f39a4e59cb0ebc5a95c0a40bb /apps/files_sharing/lib/controllers | |
| parent | 917bef39b7f1c0ca495ef102b7878ed5b15830c6 (diff) | |
| download | nextcloud-server-1d3350348797deeead5b02028c4ade7c874a7021.tar.gz nextcloud-server-1d3350348797deeead5b02028c4ade7c874a7021.zip | |
we no longer need to keep the session open for encryption
Diffstat (limited to 'apps/files_sharing/lib/controllers')
| -rw-r--r-- | apps/files_sharing/lib/controllers/sharecontroller.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index 71b5ab7f8c8..5f653e5c227 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -205,7 +205,6 @@ class ShareController extends Controller { /** * @PublicPage * @NoCSRFRequired - * @UseSession * * @param string $token * @param string $files @@ -215,12 +214,6 @@ class ShareController extends Controller { public function downloadShare($token, $files = null, $path = '') { \OC_User::setIncognitoMode(true); - // FIXME: Use DI once there is a suitable class - if (!\OCP\App::isEnabled('files_encryption')) { - // encryption app requires the session to store the keys in - \OC::$server->getSession()->close(); - } - $linkItem = OCP\Share::getShareByToken($token, false); // Share is password protected - check whether the user is permitted to access the share @@ -246,7 +239,7 @@ class ShareController extends Controller { } // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well - // after dispatching the request which results in a "Cannot modify header information" notice. + // after dispatching the request which results in a "Cannot modify header information" notice. OC_Files::get($originalSharePath, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD'); exit(); } else { |