diff options
| author | Koosha KM <koosha.khajeh@gmail.com> | 2014-11-05 16:55:21 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-11-05 16:55:21 +0100 |
| commit | 80285a18874afff056a81a0f63ef6533300b44b4 (patch) | |
| tree | bb941864da82e1de39d3460bb3fdc8fd555f7e03 /Bugzilla | |
| parent | 9925e7c74794834bad3c5fc22ff25eb0ab98e2e1 (diff) | |
| download | bugzilla-80285a18874afff056a81a0f63ef6533300b44b4.tar.gz bugzilla-80285a18874afff056a81a0f63ef6533300b44b4.tar.xz | |
Bug 1089820: Make use of User.use_markdown() defined in Bug 1059684
r=dkl,a=glob
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/WebService/Bug.pm | 17 |
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__ |