diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-03-19 04:11:53 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-03-19 04:11:53 +0100 |
| commit | 8f0cc43947fd5d93178b7f98c9548e1c4974d0b3 (patch) | |
| tree | 48b837d8586d8f53bc32237bd7fb7ac518585421 /template/en/default/email | |
| parent | 0709dae3eca4422295ad979b85dd8758e2426b76 (diff) | |
| parent | 16ca329e85e1a36a4808cc088ebc8f5d18f22dae (diff) | |
| download | bugzilla-8f0cc43947fd5d93178b7f98c9548e1c4974d0b3.tar.gz bugzilla-8f0cc43947fd5d93178b7f98c9548e1c4974d0b3.tar.xz | |
merge with bugzilla/4.2
Diffstat (limited to 'template/en/default/email')
| -rw-r--r-- | template/en/default/email/bugmail.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/email/bugmail.txt.tmpl | 12 |
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 ac4727811..fa3a447d7 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 ff2e6b8fa..c3657ad9f 100644 --- a/template/en/default/email/bugmail.txt.tmpl +++ b/template/en/default/email/bugmail.txt.tmpl @@ -54,21 +54,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 |