Skip to content

[3.0] Use more generic failed login messages #9231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sesquipedalian merged 1 commit into from
May 19, 2026
+4 −3
Merged

[3.0] Use more generic failed login messages #9231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Languages/en_US/General.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
$txt['registration_agreement'] = 'Registration Agreement';
$txt['privacy_policy'] = 'Privacy Policy';

$txt['invalid_credentials'] = 'The username or password you entered is incorrect';
$txt['username_no_exist'] = 'That username does not exist.';
$txt['no_user_with_email'] = 'There are no usernames associated with that email.';

Expand Down
6 changes: 3 additions & 3 deletions Sources/Actions/Login2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ public function main(): void
true,
)
) {
Utils::$context['login_errors'] = [Lang::getTxt('incorrect_password', file: 'Login')];
Utils::$context['login_errors'] = [Lang::getTxt('invalid_credentials', file: 'Login')];

return;
}
Expand All @@ -300,7 +300,7 @@ public function main(): void

// Let them try again, it didn't match anything...
if (empty($loaded)) {
Utils::$context['login_errors'] = [Lang::getTxt('username_no_exist', file: 'General')];
Utils::$context['login_errors'] = [Lang::getTxt('invalid_credentials', file: 'General')];

return;
}
Expand Down Expand Up @@ -642,7 +642,7 @@ protected function checkPasswordFallbacks(): bool
// Log an error so we know that it didn't go well in the error log.
ErrorHandler::log(Lang::getTxt('incorrect_password', file: 'Login') . ' - <span class="remove">' . User::$profiles[User::$my_id]['member_name'] . '</span>', 'user');

Utils::$context['login_errors'] = [Lang::getTxt('incorrect_password', file: 'Login')];
Utils::$context['login_errors'] = [Lang::getTxt('invalid_credentials', file: 'Login')];

return false;
}
Expand Down
Loading