diff options
| author | David Lawrence <dkl@mozilla.com> | 2014-10-06 17:52:33 +0200 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-10-06 17:52:33 +0200 |
| commit | aafa79dbed67514aede45f884572c30934854107 (patch) | |
| tree | def39520441fdc097877f222a32cc86e5e6fda40 /template/en/default/request | |
| parent | c034487bf62423265d0832197e0ff490f82330eb (diff) | |
| parent | 3e1e67bed36bbe454c654f1e0a16ce73e724a5e0 (diff) | |
| download | bugzilla-aafa79dbed67514aede45f884572c30934854107.tar.gz bugzilla-aafa79dbed67514aede45f884572c30934854107.tar.xz | |
merged with upstream 4.2
Diffstat (limited to 'template/en/default/request')
| -rw-r--r-- | template/en/default/request/email.txt.tmpl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index 1fed168cb..6241dd34f 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -85,11 +85,14 @@ Attachment [% attidsummary %] [%- FILTER bullet = wrap(80) %] -[% USE Bugzilla %] -[%-# .defined is necessary to avoid a taint issue in Perl < 5.10.1, see bug 509794. %] -[% IF Bugzilla.cgi.param("comment").defined && Bugzilla.cgi.param("comment").length > 0 %] -------- Additional Comments from [% user.identity %] -[%+ Bugzilla.cgi.param("comment") FILTER strip_control_chars %] +[% FOREACH comment = new_comments %] + +[%- IF comment.count %] +--- Comment #[% comment.count %] from [% comment.author.identity %] --- +[% ELSE %] +--- Description --- +[% END %] +[%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) FILTER strip_control_chars %] [% END %] [%- END %] |