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/global/user.html.tmpl | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'template/en/default/global/user.html.tmpl')

diff --git a/template/en/default/global/user.html.tmpl b/template/en/default/global/user.html.tmpl
index 7050c6d37..0ee303fe9 100644
--- a/template/en/default/global/user.html.tmpl
+++ b/template/en/default/global/user.html.tmpl
@@ -12,15 +12,19 @@
 
 <span class="vcard">
   [% FILTER collapse %]
-    [% IF user.id %]
-      <a class="email" href="mailto:[% who.email FILTER html %]"
-         title="[% who.identity FILTER html %]">
-    [%- END -%]
-    [% IF who.name %]
-       <span class="fn">[% who.name FILTER html %]</span>
+    [% IF Param("use_email_as_login") %]
+      [% IF user.id %]
+        <a class="email" href="mailto:[% who.email FILTER html %]"
+           title="[% who.identity FILTER html %]">
+      [%- END -%]
+      [% IF who.name %]
+         <span class="fn">[% who.name FILTER html %]</span>
+      [% ELSE %]
+        [% who.login FILTER email FILTER html %]
+      [% END %]
+      [% '</a>' IF user.id %]
     [% ELSE %]
-      [% who.login FILTER email FILTER html %]
+      [% who.identity FILTER html %]
     [% END %]
-    [% '</a>' IF user.id %]
   [% END %]
 </span>
-- 
cgit v1.2.3-24-g4f1b