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

Merge pull request #25430 from nextcloud/backport/25424/stable20 

[stable20] Keep direct login active when redirecting
This commit is contained in:
Roeland Jago Douma 2021-02-02 21:25:13 +01:00 committed by GitHub
parent 370ae8ac04 e7c07e722b
commit 841aa4d32c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Controller/LoginController.php
View File

@ -337,7 +337,7 @@ class LoginController extends Controller {
$user, $originalUser, $redirect_url, string $loginMessage) { $user, $originalUser, $redirect_url, string $loginMessage) {
// Read current user and append if possible we need to // Read current user and append if possible we need to
// return the unmodified user otherwise we will leak the login name // return the unmodified user otherwise we will leak the login name
$args = $user !== null ? ['user' => $originalUser] : []; $args = $user !== null ? ['user' => $originalUser, 'direct' => 1] : [];
if ($redirect_url !== null) { if ($redirect_url !== null) {
$args['redirect_url'] = $redirect_url; $args['redirect_url'] = $redirect_url;
} }