summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/WebService/Bug.pm17
1 files changed, 6 insertions, 11 deletions
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index f50bb6aee..de358b1e0 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__