diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-01-15 11:51:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 11:51:30 +0100 |
| commit | d3ab26c4b0c5c64ac166efd0c577c1b2fec8feed (patch) | |
| tree | e794ab214a79c90cdb5d7f336d2392f3ad4e5b3b | |
| parent | bcb52d64f0838030e70bbc3b1f652e239f17904d (diff) | |
| parent | f57b93098b4bc9b621f766b491b4f19c5b88d711 (diff) | |
| download | nextcloud-server-d3ab26c4b0c5c64ac166efd0c577c1b2fec8feed.tar.gz nextcloud-server-d3ab26c4b0c5c64ac166efd0c577c1b2fec8feed.zip | |
Merge pull request #25142 from nextcloud/fix/login_no_logout_redirect
Do not redirect to logout after login
| -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( |