mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25146 from nextcloud/backport/25142/stable20 

[stable20] Do not redirect to logout after login
This commit is contained in:
Morris Jobke 2021-01-15 16:45:36 +01:00 committed by GitHub
parent ac14e42b49 23f466fb10
commit 5ec9ce0bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Controller/LoginController.php
View File

@ -175,7 +175,10 @@ class LoginController extends Controller {
); );
if (!empty($redirect_url)) { 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( $this->initialStateService->provideInitialState(