diff options
| author | David Lawrence <dkl@mozilla.com> | 2014-10-28 04:01:01 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-10-28 04:01:01 +0100 |
| commit | 1f5404213d4b93ef573e99112536ed5af6643770 (patch) | |
| tree | 754731f5b78b85a71a35b700bfb28ce020342c3d /template/en/default/bug | |
| parent | 2fbc1045f5b8e82d9a68328c35ba07d70d9d1877 (diff) | |
| download | bugzilla-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')
| -rw-r--r-- | template/en/default/bug/comment.html.tmpl | 9 | ||||
| -rw-r--r-- | template/en/default/bug/comments.html.tmpl | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/template/en/default/bug/comment.html.tmpl b/template/en/default/bug/comment.html.tmpl index b748b71fd..76054f92a 100644 --- a/template/en/default/bug/comment.html.tmpl +++ b/template/en/default/bug/comment.html.tmpl @@ -32,14 +32,15 @@ <div id="comment_preview" class="bz_default_hidden bz_comment"> <div id="comment_preview_loading" class="bz_default_hidden">Generating Preview...</div> <div id="comment_preview_error" class="bz_default_hidden"></div> - <pre id="comment_preview_text" class="bz_comment_text"></pre> + <div id="comment_preview_text" class="bz_comment_text"></div> </div> [% END %] -[% IF feature_enabled('markdown') AND user.settings.use_markdown.value == 'on' %] +[% IF user.use_markdown %] <div id="comment_markdown"> - <input type="checkbox" name="use_markdown" id="use_markdown" value="1" - [% "checked=\"checked\"" IF user.settings.use_markdown.value == 'on' %] > + <input type="checkbox" name="use_markdown" + id="use_markdown" value="1" checked="checked" + onchange="refresh_markdown_preview([% bug.id FILTER none %])"> <label id="use_markdown_label" for="use_markdown">Use Markdown for this [% terms.comment %]</label> (<a href="page.cgi?id=markdown.html" target="_blank" title="View Markdown Syntax Guide">help</a>) </div> 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 %] |