Skip to content

Commit d3ab26c

Browse files
authored
Merge pull request #25142 from nextcloud/fix/login_no_logout_redirect
Do not redirect to logout after login
2 parents bcb52d6 + f57b930 commit d3ab26c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

core/Controller/LoginController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,10 @@ public function showLoginForm(string $user = null, string $redirect_url = null):
175175
);
176176

177177
if (!empty($redirect_url)) {
178-
$this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url);
178+
[$url, ] = explode('?', $redirect_url);
179+
if ($url !== $this->urlGenerator->linkToRoute('core.login.logout')) {
180+
$this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url);
181+
}
179182
}
180183

181184
$this->initialStateService->provideInitialState(

0 commit comments

Comments
 (0)