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/admin/users/confirm-delete.html.tmpl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'template/en/default/admin/users/confirm-delete.html.tmpl')

diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 4dab8b471..07b6ccb25 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -51,9 +51,15 @@
     <th>Field</th>
     <th>Value</th>
   </tr>
+  [% IF !Param('use_email_as_login') %]
+    <tr>
+      <th>Login:</th>
+      <td>[% otheruser.login FILTER html %]</td>
+    </tr>
+  [% END %]
   <tr>
-    <th>Login name:</th>
-    <td>[% otheruser.login FILTER html %]</td>
+    <th>Email address:</th>
+    <td>[% otheruser.email FILTER html %]</td>
   </tr>
   <tr>
     <th>Real name:</th>
-- 
cgit v1.2.3-24-g4f1b