summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2014-12-22 23:59:04 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2014-12-22 23:59:04 +0100
commit1447622fb19fb6755be78efc1c3fc79826ced5c8 (patch)
tree41931c52d976c123659a9d128869001227180dd2
parentb290e224c068400a18b39b76097fb3522a82c5b8 (diff)
downloadbugzilla-1447622fb19fb6755be78efc1c3fc79826ced5c8.tar.gz
bugzilla-1447622fb19fb6755be78efc1c3fc79826ced5c8.tar.xz
Bug 1114411: Do not call replyToMarkdownComment() if user pref use_markdown = off
r/a=dkl
-rw-r--r--template/en/default/bug/comments.html.tmpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 0c7408a48..1281bb6df 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -18,6 +18,7 @@
[% DEFAULT mode = "show" %]
[% user_cache = template_cache.users %]
+[% markdown_enabled = feature_enabled('jsonrpc') AND user.settings.use_markdown.value == "on" %]
<!-- This auto-sizes the comments and positions the collapse/expand links
to the right. -->
@@ -101,7 +102,7 @@
[<a class="bz_reply_link" href="#add_comment"
[% IF user.settings.quote_replies.value != 'off' %]
onclick="
- [% IF feature_enabled('jsonrpc') && comment.is_markdown %]
+ [% IF markdown_enabled AND comment.is_markdown %]
replyToMarkdownComment('[% comment.count %]', '[% comment.id %]', '[% replyto_header FILTER js %]'); return false;"
[% ELSE %]
replyToComment('[% comment.count %]', '[% comment.id %]', '[% replyto_header FILTER js %]', null); return false;"