Bug 238651 (a&b) Include the login name (in <code>) for "account_inexistent" error

r=lpsolit a=lpsolit

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 77d7d335c8de891857f575fde63fc3c9e398a88c..3f82c1c92cafb199bea2d622d2716408929ec04f 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/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.
+    <code>[% email FILTER html %]</code> is not a valid [% terms.Bugzilla %]
+    account.
 
   [% ELSIF error == "alias_has_comma_or_space" %]
     [% title = "Invalid Characters In Alias" %]

diff --git a/token.cgi b/token.cgi
index a07a969fd1b0c15b89408ab0b3dc75378a365d4e..dd41e466520e22c6e0a74a87590cac4edb04d3cf 100755 (executable)
--- a/token.cgi
+++ b/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