summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-03-03 15:57:26 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2012-03-03 15:57:26 +0100
commit62ee1dc62640cc82b5ca520a2c118583b8d7e9ed (patch)
tree87e768a79d9e94d85cc96a71df74190c287484ee /template/en
parenta3310aa7a7c8e8f76a2a9c9adf59bc7346a6f752 (diff)
downloadbugzilla-62ee1dc62640cc82b5ca520a2c118583b8d7e9ed.tar.gz
bugzilla-62ee1dc62640cc82b5ca520a2c118583b8d7e9ed.tar.xz
Bug 731586: Email notifications about status changes in blockers are incorrectly formatted
r=dkl a=LpSolit
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/email/bugmail.html.tmpl6
-rw-r--r--template/en/default/email/bugmail.txt.tmpl12
2 files changed, 7 insertions, 11 deletions
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index d8138cf7f..8e30cff4b 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -47,10 +47,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 e56bab357..b51935f64 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -35,21 +35,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