From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 3 Mar 2012 15:00:27 +0000 (+0100)
Subject: Bug 731586: Email notifications about status changes in blockers are incorrectly... 
X-Git-Tag: bugzilla-4.2.1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4d48bbcc731852975f27365d1af7e27e6db5d57;p=thirdparty%2Fbugzilla.git

Bug 731586: Email notifications about status changes in blockers are incorrectly formatted
r=dkl a=LpSolit
---

diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index ac47278118..fa3a447d7f 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -59,10 +59,10 @@
 
 [% BLOCK generate_diffs %]
   [% SET in_table = 0 %]
-  [% last_changer = "" %]
+  [% last_changer = 0 %]
     [% FOREACH change = diffs %]
-      [% IF !isnew && change.who.login != last_changer %]
-        [% last_changer = change.who.login %]
+      [% IF !isnew && changer.id != last_changer %]
+        [% last_changer = changer.id %]
         [% IF in_table == 1 %]
           </table>
           [% SET in_table = 0 %]
diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl
index 2d20aff7c7..0b349fb156 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -50,21 +50,17 @@ You are receiving this mail because:
 [% BLOCK generate_diffs %]
   [% urlbase %]show_bug.cgi?id=[% bug.id %]
 
-[%+ last_changer = "" %]
+[%+ last_changer = 0 %]
   [% FOREACH change = diffs %]
-    [% IF !isnew && change.who.login != last_changer %]
-      [% last_changer = change.who.login %]
+    [% IF !isnew && changer.id != last_changer %]
+      [% last_changer = changer.id %]
       [% IF change.blocker %]
         [% terms.Bug %] [%+ bug.id %] depends on [% terms.bug %] [%+ change.blocker.id %], which changed state.
 
 [%+ terms.Bug %] [%+ change.blocker.id %] Summary: [% change.blocker.short_desc %]
 [%+ urlbase %]show_bug.cgi?id=[% change.blocker.id %]
       [% ELSE %]
-        [%~ IF change.who.name %]
-          [% change.who.name _ " <" _ change.who.login _ ">" %]
-        [% ELSE %]
-          [% change.who.login %]
-        [% END %] changed:
+        [%~ changer.identity %] changed:
       [% END %]
 
            What    |Removed                     |Added