summaryrefslogtreecommitdiffstats
path: root/template/en/default/bug/comments.html.tmpl
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2014-10-28 04:01:01 +0100
committerDavid Lawrence <dkl@mozilla.com>2014-10-28 04:01:01 +0100
commit1f5404213d4b93ef573e99112536ed5af6643770 (patch)
tree754731f5b78b85a71a35b700bfb28ce020342c3d /template/en/default/bug/comments.html.tmpl
parent2fbc1045f5b8e82d9a68328c35ba07d70d9d1877 (diff)
downloadbugzilla-1f5404213d4b93ef573e99112536ed5af6643770.tar.gz
bugzilla-1f5404213d4b93ef573e99112536ed5af6643770.tar.xz
Bug 1059684: markdown text should not be rendered within a <pre> tag
r=glob,a=glob
Diffstat (limited to 'template/en/default/bug/comments.html.tmpl')
-rw-r--r--template/en/default/bug/comments.html.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 617f49471..3895691d7 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -267,12 +267,12 @@
[%# Don't indent the <pre> block, since then the spaces are displayed in the
# generated HTML
#%]
-<pre class="bz_comment_text[% " collapsed" IF comment.collapsed %]"
+<[% user.use_markdown(comment) ? "div" : "pre" %] class="bz_comment_text[% " collapsed" IF comment.collapsed %]"
[% IF mode == "edit" || comment.collapsed %]
id="comment_text_[% comment.count FILTER none %]"
[% END %]>
[%- comment_text FILTER markdown(bug, comment) -%]
-</pre>
+</[% user.use_markdown(comment) ? "div" : "pre" %]>
[% Hook.process('a_comment-end', 'bug/comments.html.tmpl') %]
</div>
[% END %]