From: Koosha KM <koosha.khajeh@gmail.com>
Date: Wed, 5 Nov 2014 15:55:21 +0000 (+0000)
Subject: Bug 1089820: Make use of User.use_markdown() defined in Bug 1059684
X-Git-Tag: release-5.1.1~466
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80285a18874afff056a81a0f63ef6533300b44b4;p=thirdparty%2Fbugzilla.git

Bug 1089820: Make use of User.use_markdown() defined in Bug 1059684
r=dkl,a=glob
---

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index f50bb6aee3..de358b1e02 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -832,7 +832,8 @@ sub add_attachment {
             $comment     = $params->{comment}->{body};
         }
 
-        ThrowUserError('markdown_disabled') if $is_markdown && !_is_markdown_enabled();
+        ThrowUserError('markdown_disabled')
+            if $is_markdown && !Bugzilla->user->use_markdown();
 
         $attachment->bug->add_comment($comment,
             { is_markdown => $is_markdown,
@@ -891,7 +892,8 @@ sub update_attachment {
         $comment     = $comment->{body};
     }
 
-    ThrowUserError('markdown_disabled') if $is_markdown && !_is_markdown_enabled();
+    ThrowUserError('markdown_disabled')
+        if $is_markdown && !$user->use_markdown();
 
     # Update the values
     foreach my $attachment (@attachments) {
@@ -972,7 +974,8 @@ sub add_comment {
         $params->{is_private} = delete $params->{private};
     }
 
-    ThrowUserError('markdown_disabled') if $params->{is_markdown} && !_is_markdown_enabled();
+    ThrowUserError('markdown_disabled')
+        if $params->{is_markdown} && !$user->use_markdown();
 
     # Append comment
     $bug->add_comment($comment, { isprivate   => $params->{is_private},
@@ -1425,14 +1428,6 @@ sub _add_update_tokens {
     }
 }
 
-sub _is_markdown_enabled {
-    my $user = Bugzilla->user;
-
-    return Bugzilla->feature('markdown')
-            && $user->settings->{use_markdown}->{is_enabled}
-            && $user->setting('use_markdown') eq 'on';
-}
-
 1;
 
 __END__