From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 22 Dec 2014 22:59:04 +0000 (+0100)
Subject: Bug 1114411: Do not call replyToMarkdownComment() if user pref use_markdown = off
X-Git-Tag: release-5.1.1~407
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1447622fb19fb6755be78efc1c3fc79826ced5c8;p=thirdparty%2Fbugzilla.git

Bug 1114411: Do not call replyToMarkdownComment() if user pref use_markdown = off
r/a=dkl
---

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 0c7408a487..1281bb6df5 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;"