diff options
| -rw-r--r-- | Bugzilla.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Markdown.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Template.pm | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm index 7d935db48..af670e90f 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -398,6 +398,8 @@ sub logout_request { } sub markdown { + return if !Bugzilla->feature('markdown'); + require Bugzilla::Markdown; return $_[0]->request_cache->{markdown} ||= Bugzilla::Markdown->new(); } diff --git a/Bugzilla/Markdown.pm b/Bugzilla/Markdown.pm index 6cbe0f6c4..5f1a7d955 100644 --- a/Bugzilla/Markdown.pm +++ b/Bugzilla/Markdown.pm @@ -62,8 +62,7 @@ sub markdown { my $text = shift; my $user = Bugzilla->user; - if (Bugzilla->feature('markdown') - && $user->settings->{use_markdown}->{is_enabled} + if ($user->settings->{use_markdown}->{is_enabled} && $user->setting('use_markdown') eq 'on') { return $self->SUPER::markdown($text, @_); diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 78a3e4120..aee7933ed 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -813,8 +813,9 @@ sub create { my $text = shift; return unless $text; - if ((ref($comment) eq 'HASH' && $comment->{is_markdown}) - || (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown)) + if (Bugzilla->feature('markdown') + && ((ref($comment) eq 'HASH' && $comment->{is_markdown}) + || (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown))) { return Bugzilla->markdown->markdown($text); } |