Skip to content

Commit d2607b7

Browse files
committed
fix: initialise loginName before isset check to avoid undefined-key warning
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
1 parent 1758caf commit d2607b7

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

core/Controller/LoginController.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,10 @@ public function showLoginForm($user, $redirect_url, $remember_login) {
165165
// if the user exists, replace the userid with the username, e.g. for LDAP accounts
166166
// that have the owncloud internal username set to a uuid.
167167
$u = $this->userManager->get($user);
168-
if ($u !== null) {
168+
$parameters['loginName'] = $user;
169+
if ($u !== null && \is_string($u->getUserName()) && $u->getUserName() !== '') {
169170
$parameters['loginName'] = $u->getUserName();
170171
}
171-
if (!\is_string($parameters['loginName']) || $parameters['loginName'] === '') {
172-
$parameters['loginName'] = $user;
173-
}
174172
$parameters['user_autofocus'] = false;
175173
} else {
176174
$parameters['loginName'] = '';

0 commit comments

Comments
 (0)