Merge pull request #25142 from nextcloud/fix/login_no_logout_redirect

Do not redirect to logout after login
3 years ago · d3ab26c4b0
parent bcb52d64f0 f57b93098b
commit d3ab26c4b0
1 changed files with 4 additions and 1 deletions
--- 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(