diff options
| -rw-r--r-- | core/Controller/LoginController.php | 8 | ||||
| -rw-r--r-- | core/templates/login.php | 2 | ||||
| -rw-r--r-- | tests/core/controller/LoginControllerTest.php | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index ef6e1974842..ba9a1fee23a 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -95,10 +95,10 @@ class LoginController extends Controller { $parameters['messages'] = $messages; if ($user !== '') { - $parameters['username'] = $user; + $parameters['loginName'] = $user; $parameters['user_autofocus'] = false; } else { - $parameters['username'] = ''; + $parameters['loginName'] = ''; $parameters['user_autofocus'] = true; } if (!empty($redirect_url)) { @@ -120,10 +120,10 @@ class LoginController extends Controller { $parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0; if ($user !== '') { - $parameters['username'] = $user; + $parameters['loginName'] = $user; $parameters['user_autofocus'] = false; } else { - $parameters['username'] = ''; + $parameters['loginName'] = ''; $parameters['user_autofocus'] = true; } diff --git a/core/templates/login.php b/core/templates/login.php index f683323337d..8405bac6890 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -41,7 +41,7 @@ script('core', [ <p class="grouptop"> <input type="text" name="user" id="user" placeholder="<?php p($l->t('Username')); ?>" - value="<?php p($_['username']); ?>" + value="<?php p($_['loginName']); ?>" <?php p($_['user_autofocus'] ? 'autofocus' : ''); ?> autocomplete="on" autocapitalize="off" autocorrect="off" required> <label for="user" class="infield"><?php p($l->t('Username')); ?></label> diff --git a/tests/core/controller/LoginControllerTest.php b/tests/core/controller/LoginControllerTest.php index 186b8c4c5bb..f0ffe57d7b4 100644 --- a/tests/core/controller/LoginControllerTest.php +++ b/tests/core/controller/LoginControllerTest.php @@ -104,7 +104,7 @@ class LoginControllerTest extends TestCase { 'MessageArray1', 'MessageArray2', ], - 'username' => '', + 'loginName' => '', 'user_autofocus' => true, 'canResetPassword' => true, 'alt_login' => [], @@ -162,7 +162,7 @@ class LoginControllerTest extends TestCase { 'login', [ 'messages' => [], - 'username' => 'LdapUser', + 'loginName' => 'LdapUser', 'user_autofocus' => false, 'canResetPassword' => $expectedResult, 'alt_login' => [], @@ -200,7 +200,7 @@ class LoginControllerTest extends TestCase { 'login', [ 'messages' => [], - 'username' => '0', + 'loginName' => '0', 'user_autofocus' => false, 'canResetPassword' => false, 'alt_login' => [], |