From: timeless%mozdev.org <>
Date: Mon, 23 Jul 2007 14:47:11 +0000 (+0000)
Subject: Bug 238651 (a&b) Include the login name (in <code>) for "account_inexistent" error
X-Git-Tag: bugzilla-3.1.2~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e32409b83feed1df480f17f7b26535922f97b66;p=thirdparty%2Fbugzilla.git

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 77d7d335c8..3f82c1c92c 100644
--- 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 a07a969fd1..dd41e46652 100755
--- 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