diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2021-01-15 09:29:54 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2021-01-15 09:35:51 +0100 |
| commit | f57b93098b4bc9b621f766b491b4f19c5b88d711 (patch) | |
| tree | ed25f96ce858781d722efe4225f5ad7cf13e28f3 | |
| parent | c80e007607ebffd6e1c6f2b2b02df049ba4575ff (diff) | |
| download | nextcloud-server-f57b93098b4bc9b621f766b491b4f19c5b88d711.tar.gz nextcloud-server-f57b93098b4bc9b621f766b491b4f19c5b88d711.zip | |
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 <roeland@famdouma.nl>
| -rw-r--r-- | core/Controller/LoginController.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 7073584a66b..097a7708318 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( |