summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-02-02 10:27:51 +0100
committerGitHub <noreply@github.com>2021-02-02 10:27:51 +0100
commit392dc8b8fa615b2aa9f54744e6c7f329e70a202f (patch)
treefd60103981785528ddd0f78ff76904cb32c7a643
parent480f786fa0bfcc432e0b2b1f1fc2d0664a4c42d6 (diff)
parentd7a80293ab4d18953244e375c3311df2343abf69 (diff)
downloadnextcloud-server-392dc8b8fa615b2aa9f54744e6c7f329e70a202f.tar.gz
nextcloud-server-392dc8b8fa615b2aa9f54744e6c7f329e70a202f.zip
Merge pull request #25424 from nextcloud/bugfix/noid/direct-login-fail
Keep direct login active when redirecting
-rw-r--r--core/Controller/LoginController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 097a7708318..753631ddf6f 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -337,7 +337,7 @@ class LoginController extends Controller {
$user, $originalUser, $redirect_url, string $loginMessage) {
// Read current user and append if possible we need to
// 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) {
$args['redirect_url'] = $redirect_url;
}