diff options
| author | reed%reedloden.com <> | 2010-01-05 08:05:59 +0100 |
|---|---|---|
| committer | reed%reedloden.com <> | 2010-01-05 08:05:59 +0100 |
| commit | f170f68df81a531091578baca25c789076a3c467 (patch) | |
| tree | f32a2ae8d30257d420167cc9dc5a7b1495bcac2d | |
| parent | 0c266590b454f88f55fb4b39a5bce5532ca5baa0 (diff) | |
| download | bugzilla-f170f68df81a531091578baca25c789076a3c467.tar.gz bugzilla-f170f68df81a531091578baca25c789076a3c467.tar.xz | |
Bug 534587 - "Bugmail uses the timezone of the changee instead of the user receiving the mail" [p=reed r=mkanat a=mkanat]
| -rw-r--r-- | Bugzilla/BugMail.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Util.pm | 4 | ||||
| -rw-r--r-- | template/en/default/email/newchangedmail.txt.tmpl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 2aff7daf4..f7af921eb 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -612,7 +612,7 @@ sub sendMail { my $vars = { isnew => $isnew, - to => $user->email, + to_user => $user, bugid => $id, alias => Bugzilla->params->{'usebugaliases'} ? $values{'alias'} : "", classification => $values{'classification'}, diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index ca2506ffa..437979c85 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -413,8 +413,8 @@ sub wrap_hard { sub format_time { my ($date, $format, $timezone) = @_; - # If $format is undefined, try to guess the correct date format. - if (!defined($format)) { + # If $format is not set, try to guess the correct date format. + if (!$format) { if (!ref $date && $date =~ /^(\d{4})[-\.](\d{2})[-\.](\d{2}) (\d{2}):(\d{2})(:(\d{2}))?$/) { diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl index 368c23713..1bcc2e40d 100644 --- a/template/en/default/email/newchangedmail.txt.tmpl +++ b/template/en/default/email/newchangedmail.txt.tmpl @@ -20,7 +20,7 @@ [% PROCESS "global/variables.none.tmpl" %] From: [% Param('mailfrom') %] -To: [% to %] +To: [% to_user.email %] Subject: [[% terms.Bug %] [%+ bugid %]] [% 'New: ' IF isnew %][%+ summary %] X-Bugzilla-Reason: [% reasonsheader %] X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %] @@ -48,7 +48,7 @@ X-Bugzilla-Changed-Fields: [% changedfields %] [% FOREACH comment = new_comments %] [%- IF comment.count %] ---- Comment #[% comment.count %] from [% comment.author.identity %] [%+ comment.time FILTER time %] --- +--- Comment #[% comment.count %] from [% comment.author.identity %] [%+ comment.time FILTER time(undef, to_user.timezone) %] --- [% END %] [%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) %] [% END %] |