From 23f466fb1033d172cf6997efdbc9d47b21cf8ae2 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 15 Jan 2021 09:29:54 +0100 Subject: [PATCH] Do not redirect to logout after login This can happen when the session was killed due to a timeout. Then logout was triggered. Nobody wants to login only to be logged out again. Signed-off-by: Roeland Jago Douma --- core/Controller/LoginController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 7073584a66..097a770831 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -175,7 +175,10 @@ class LoginController extends Controller { ); if (!empty($redirect_url)) { - $this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url); + [$url, ] = explode('?', $redirect_url); + if ($url !== $this->urlGenerator->linkToRoute('core.login.logout')) { + $this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url); + } } $this->initialStateService->provideInitialState(