X Tutup
Skip to content

Commit dce224b

Browse files
authored
be more defensive with the user name
1 parent a1af306 commit dce224b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

core/Controller/LoginController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,12 @@ public function showLoginForm($user, $redirect_url, $remember_login) {
143143
// if the user exists, replace the userid with the username, eg. for LDAP accounts
144144
// that have the owncloud internal username set to a uuid.
145145
$u = $this->userManager->get($user);
146-
if ($u === null) {
147-
$parameters['loginName'] = $user;
148-
} else {
146+
if ($u !== null) {
149147
$parameters['loginName'] = $u->getUserName();
150148
}
149+
if (!\is_string($parameters['loginName']) || $parameters['loginName'] === '') {
150+
$parameters['loginName'] = $user;
151+
}
151152
$parameters['user_autofocus'] = false;
152153
} else {
153154
$parameters['loginName'] = '';

0 commit comments

Comments
 (0)
X Tutup