summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extensions/BMO/template/en/default/email/bugmail.html.tmpl4
-rw-r--r--template/en/default/email/bugmail.html.tmpl4
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
index 7daec3b2e..094b0c579 100644
--- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
@@ -44,7 +44,7 @@
[% "Comment # ${comment.count}"
FILTER bug_link(bug, { comment_num => comment.count, full_url => 1 }) FILTER none %]
on [% "$terms.Bug $bug.id" FILTER bug_link(bug, { full_url => 1 }) FILTER none %]
- from [% INCLUDE global/user.html.tmpl who = comment.author %]
+ from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]
at [% comment.creation_ts FILTER time(undef, to_user.timezone) %]
</b>
[% END %]
@@ -152,7 +152,7 @@
[% terms.Bug %]&nbsp;[% change.blocker.id FILTER none %]</a>,
which changed state.<br>
[% ELSE %]
- [% INCLUDE global/user.html.tmpl who = change.who %] changed
+ [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
[%+ "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %]
at [% change.bug_when FILTER time(undef, to_user.timezone) %]</b>:<br>
[% END %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index 88c935d87..2cd9318c1 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -34,7 +34,7 @@
<b>[% "Comment # ${comment.count}" FILTER bug_link(bug,
{comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %]
on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
- from [% INCLUDE global/user.html.tmpl who = comment.author %]</b>
+ from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
[% END %]
<pre>[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment, to_user) %]</pre>
</div>
@@ -90,7 +90,7 @@
FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %],
which changed state.
[% ELSE %]
- [% INCLUDE global/user.html.tmpl who = change.who %] changed
+ [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
[%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
[% END %]
<br>