From ec87e5310ad038abe4b2b329897638d866bf549a Mon Sep 17 00:00:00 2001
From: Dylan William Hardison block, since then the spaces are
- # displayed in the generated HTML
+[%# Don't indent the
block, since then the spaces are displayed in the
+ # generated HTML
#%]
-<[% comment_tag FILTER none %] class="bz_comment_text[% " collapsed" IF comment.collapsed %]"
+
- [%- comment_text FILTER renderComment(bug, comment) -%]
-[% comment_tag FILTER none %]>
+ [%- comment_text FILTER quoteUrls(bug, comment) -%]
+
[% Hook.process('a_comment-end', 'bug/comments.html.tmpl') %]
[% END %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 69edfeb00..445e5fe0d 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -253,7 +253,7 @@
([% bug.alias FILTER html %])
[% END %]
[% END %]
- [% bug.short_desc FILTER renderComment(bug, undef, 1) FILTER wbr %]
+ [% bug.short_desc FILTER quoteUrls(bug) FILTER wbr %]
[% IF bug.check_can_change_field('short_desc', 0, 1) ||
bug.check_can_change_field('alias', 0, 1) %]
(edit)
diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl
index 17b85589c..dc09848da 100644
--- a/template/en/default/bug/link.html.tmpl
+++ b/template/en/default/bug/link.html.tmpl
@@ -56,8 +56,7 @@
diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl
index 185ae771b..ef5e361c0 100644
--- a/template/en/default/bug/new_bug.html.tmpl
+++ b/template/en/default/bug/new_bug.html.tmpl
@@ -244,7 +244,7 @@
[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment, to_user) %]
[% END %]
[% END %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index cdcb3d13d..8b567b691 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -38,12 +38,7 @@
on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]
[% END %]
- [% IF comment.is_markdown %]
- [% comment_tag = 'div' %]
- [% ELSE %]
- [% comment_tag = 'pre' %]
- [% END %]
- <[% comment_tag FILTER none %]>[% comment.body_full({ wrap => 1 }) FILTER renderComment(bug, comment) %][% comment_tag FILTER none %]>
+
-[%- cgi.param("text") FILTER renderComment FILTER html -%] +[%- cgi.param("text") FILTER quoteUrls FILTER html -%]@@ -46,7 +46,7 @@
-[%- cgi.param("text") FILTER renderComment -%] +[%- cgi.param("text") FILTER quoteUrls -%]-- cgit v1.2.3-24-g4f1b