From 3891b63a1eb52076337885487f251a10580a4a85 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 27 Apr 2016 18:50:13 +0200
Subject: Bug 218917 - Allow the login name to be different from the email
 address Original patch by Gervase Markham r=gerv a=dkl

---
 template/en/default/account/request-new-password.html.tmpl | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'template/en/default/account/request-new-password.html.tmpl')

diff --git a/template/en/default/account/request-new-password.html.tmpl b/template/en/default/account/request-new-password.html.tmpl
index a94b3a114..73caa6dcb 100644
--- a/template/en/default/account/request-new-password.html.tmpl
+++ b/template/en/default/account/request-new-password.html.tmpl
@@ -10,20 +10,14 @@
 
 [% IF user.authorizer.can_change_password %]
   <p>
-    If you have an account, but have forgotten your password, enter your
-    [% IF Param('emailsuffix') %]
-      login name
-    [% ELSE %]
-      email address
-    [% END %]
-    below and submit a request to change your password. An email with details
-    on how to reset your password will be sent.
+    If you have an account, but have forgotten your password, enter your email
+    address below and submit a request to change your password. An email with
+    details on how to reset your password will be sent.
   </p>
 
   <form id="forgot_password" method="get" action="token.cgi">
     <input type="hidden" name="a" value="reqpw">
-    <input id="loginname" [% IF !Param('emailsuffix') %]type="email"[% END %]
-           name="loginname" autofocus required>
+    <input id="email" type="email" name="email" autofocus required>
     <input type="hidden" id="token" name="token"
            value="[% issue_hash_token(['reqpw']) FILTER html %]">
     <input type="submit" id="request" value="Reset Password">
-- 
cgit v1.2.3-24-g4f1b