summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2011-04-23 19:19:08 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2011-04-23 19:19:08 +0200
commit99d1623cca1ce087317080a2f95d6afb5b4834ee (patch)
tree89f9114e8f6754edbd8a6ffd749d7a235a2e59be /template
parent2c01ae87b090bed0e655ed8e36d41405b28079d1 (diff)
downloadbugzilla-99d1623cca1ce087317080a2f95d6afb5b4834ee.tar.gz
bugzilla-99d1623cca1ce087317080a2f95d6afb5b4834ee.tar.xz
Bug 652165: Flagmails have a wrong Date: value
r=wicked a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/email/bugmail-header.txt.tmpl2
-rw-r--r--template/en/default/request/email.txt.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index c2b4ea4f5..94559a942 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -27,7 +27,7 @@
From: [% Param('mailfrom') %]
To: [% to_user.email %]
Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF isnew %][%+ bug.short_desc %]
-Date: [% delta_ts || bug.delta_ts FILTER time("%a, %d %b %Y %T %z", to_user.timezone) %]
+Date: [% date %]
X-Bugzilla-Reason: [% reasonsheader %]
X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 03c5e57c0..182ac09e0 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -51,7 +51,7 @@ To: [% to %]
Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]
[%- IF attachment %] :
[Attachment [% attachment.id %]] [% attachment.description %][% END %]
-Date: [% bug.delta_ts FILTER time("%a, %d %b %Y %T %z", timezone) %]
+Date: [% date %]
X-Bugzilla-Type: request
[%+ threadingmarker %]