summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-02-06 15:38:54 +0100
committerGitHub <noreply@github.com>2019-02-06 15:38:54 +0100
commita1aa6ee70d45d359d7e277873106a668aa642305 (patch)
treee276836e5276c092c29bf39691335ce2d0850e4b /core
parent0df5110127a794ab25cf677aa98787ec12ee6fa3 (diff)
parent60e5a5eca42f3b10053c423e4aedef9e09f2c48c (diff)
downloadnextcloud-server-a1aa6ee70d45d359d7e277873106a668aa642305.tar.gz
nextcloud-server-a1aa6ee70d45d359d7e277873106a668aa642305.zip
Merge pull request #12573 from nextcloud/fix/12568/special_handling_of_logout
Do not do redirect handling when loggin out
Diffstat (limited to 'core')
-rw-r--r--core/Controller/LoginController.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 5697430051f..85d3b6b837f 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -134,6 +134,9 @@ class LoginController extends Controller {
'core.login.showLoginForm',
['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
));
+
+ $this->session->set('clearingExecutionContexts', '1');
+ $this->session->close();
$response->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
return $response;
}
@@ -149,7 +152,6 @@ class LoginController extends Controller {
* @return TemplateResponse|RedirectResponse
*/
public function showLoginForm(string $user = null, string $redirect_url = null): Http\Response {
-
if ($this->userSession->isLoggedIn()) {
return new RedirectResponse(OC_Util::getDefaultPageUrl());
}