Merge pull request #25142 from nextcloud/fix/login_no_logout_redirect

Do not redirect to logout after login
nextcloud · Jan 15, 2021 · d3ab26c · d3ab26c
2 parents bcb52d6 + f57b930
commit d3ab26c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
@@ -175,7 +175,10 @@ public function showLoginForm(string $user = null, string $redirect_url = null):
 		);
 
 		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(