From 301d5b8664473fabf39824e5f415928dca577c7e Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Mon, 23 Jul 2007 09:47:13 +0000 Subject: [PATCH] Bug 238651 (a&b) Include the login name (in ) for "account_inexistent" error r=lpsolit a=lpsolit --- .../bugzilla/template/en/default/global/user-error.html.tmpl | 5 +++-- webtools/bugzilla/token.cgi | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/webtools/bugzilla/template/en/default/global/user-error.html.tmpl b/webtools/bugzilla/template/en/default/global/user-error.html.tmpl index 77d7d335c8d..3f82c1c92ca 100644 --- a/webtools/bugzilla/template/en/default/global/user-error.html.tmpl +++ b/webtools/bugzilla/template/en/default/global/user-error.html.tmpl @@ -68,9 +68,10 @@ that login name. [% END %] - [% ELSIF error == "account_inexistent" %] + [% ELSIF error == "account_does_not_exist" %] [% title = "Account Does Not Exist" %] - There is no [% terms.Bugzilla %] account with that login name. + [% email FILTER html %] is not a valid [% terms.Bugzilla %] + account. [% ELSIF error == "alias_has_comma_or_space" %] [% title = "Invalid Characters In Alias" %] diff --git a/webtools/bugzilla/token.cgi b/webtools/bugzilla/token.cgi index a07a969fd1b..dd41e466520 100755 --- a/webtools/bugzilla/token.cgi +++ b/webtools/bugzilla/token.cgi @@ -118,7 +118,7 @@ if ( $::action eq 'reqpw' ) { my ($user_id) = $dbh->selectrow_array('SELECT userid FROM profiles WHERE ' . $dbh->sql_istrcmp('login_name', '?'), undef, $login_name); - $user_id || ThrowUserError("account_inexistent"); + $user_id || ThrowUserError("account_does_not_exist", {'email' => $login_name}); } # If the user is changing their password, make sure they submitted a new