summaryrefslogtreecommitdiffstats
path: root/template/en/default/email
diff options
context:
space:
mode:
authorDavid Lawrence <dlawrence@mozilla.com>2011-10-05 22:38:47 +0200
committerDavid Lawrence <dlawrence@mozilla.com>2011-10-05 22:38:47 +0200
commit1d44809edc5e460f5c5035ebb272f1fe776465cc (patch)
treebe71e1a406799044449303b7a4c09854046efe08 /template/en/default/email
parentbefdcc8f9a30f55e91227bac0ee1813a661002b3 (diff)
downloadbugzilla-1d44809edc5e460f5c5035ebb272f1fe776465cc.tar.gz
bugzilla-1d44809edc5e460f5c5035ebb272f1fe776465cc.tar.xz
Some more 4.2 porting fixes
Diffstat (limited to 'template/en/default/email')
-rw-r--r--template/en/default/email/bugmail-header.txt.tmpl4
-rw-r--r--template/en/default/email/bugmail.txt.tmpl2
2 files changed, 3 insertions, 3 deletions
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index 94559a942..85226b472 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -22,11 +22,13 @@
[% PROCESS "global/field-descs.none.tmpl" %]
[% PROCESS "global/reason-descs.none.tmpl" %]
+[% show_new = isnew
+ && (to_user.settings.bugmail_new_prefix.value == 'on') %]
[% isnew = bug.lastdiffed ? 0 : 1 %]
From: [% Param('mailfrom') %]
To: [% to_user.email %]
-Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF isnew %][%+ bug.short_desc %]
+Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF show_new %][%+ bug.short_desc %]
Date: [% date %]
X-Bugzilla-Reason: [% reasonsheader %]
X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl
index 7c0bace4a..e890472ad 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -22,8 +22,6 @@
[% PROCESS "global/field-descs.none.tmpl" %]
[% PROCESS "global/reason-descs.none.tmpl" %]
-[% show_new = isnew
- && (to_user.settings.bugmail_new_prefix.value == 'on') %]
[% isnew = bug.lastdiffed ? 0 : 1 %]