diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2011-04-23 19:19:08 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2011-04-23 19:19:08 +0200 |
| commit | 99d1623cca1ce087317080a2f95d6afb5b4834ee (patch) | |
| tree | 89f9114e8f6754edbd8a6ffd749d7a235a2e59be /Bugzilla/BugMail.pm | |
| parent | 2c01ae87b090bed0e655ed8e36d41405b28079d1 (diff) | |
| download | bugzilla-99d1623cca1ce087317080a2f95d6afb5b4834ee.tar.gz bugzilla-99d1623cca1ce087317080a2f95d6afb5b4834ee.tar.xz | |
Bug 652165: Flagmails have a wrong Date: value
r=wicked a=LpSolit
Diffstat (limited to 'Bugzilla/BugMail.pm')
| -rw-r--r-- | Bugzilla/BugMail.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 9d63b9c79..03eb1925d 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -224,6 +224,11 @@ sub Send { my @sent; my @excluded; + # The email client will display the Date: header in the desired timezone, + # so we can always use UTC here. + my $date = $params->{dep_only} ? $end : $bug->delta_ts; + $date = format_time($date, '%a, %d %b %Y %T %z', 'UTC'); + foreach my $user_id (keys %recipients) { my %rels_which_want; my $sent_mail = 0; @@ -268,7 +273,7 @@ sub Send { { to => $user, bug => $bug, comments => $comments, - delta_ts => $params->{dep_only} ? $end : undef, + date => $date, changer => $changer, watchers => exists $watching{$user_id} ? $watching{$user_id} : undef, @@ -304,7 +309,7 @@ sub sendMail { my $user = $params->{to}; my $bug = $params->{bug}; my @send_comments = @{ $params->{comments} }; - my $delta_ts = $params->{delta_ts}; + my $date = $params->{date}; my $changer = $params->{changer}; my $watchingRef = $params->{watchers}; my @diffs = @{ $params->{diffs} }; @@ -348,7 +353,7 @@ sub sendMail { push @watchingrel, map { user_id_to_login($_) } @$watchingRef; my $vars = { - delta_ts => $delta_ts, + date => $date, to_user => $user, bug => $bug, reasons => \@reasons, |