Skip to content

bugzilla
bugzilla
Commit c11b241b authored by Koosha KM's avatar Koosha KM Committed by David Lawrence
Browse files
Options

Bug 1064933: Bugzilla.pm does not compile without Text::Markdown

r=glob,a=sgreen
parent e1603d01
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
Bugzilla.pm
View file @ c11b241b
...@@ -398,6 +398,8 @@ sub logout_request { ...@@ -398,6 +398,8 @@ sub logout_request {
} }
sub markdown { sub markdown {
return if !Bugzilla->feature('markdown');
require Bugzilla::Markdown; require Bugzilla::Markdown;
return $_[0]->request_cache->{markdown} ||= Bugzilla::Markdown->new(); return $_[0]->request_cache->{markdown} ||= Bugzilla::Markdown->new();
} }
......
Bugzilla/Markdown.pm
View file @ c11b241b
...@@ -62,8 +62,7 @@ sub markdown { ...@@ -62,8 +62,7 @@ sub markdown {
my $text = shift; my $text = shift;
my $user = Bugzilla->user; my $user = Bugzilla->user;
if (Bugzilla->feature('markdown') if ($user->settings->{use_markdown}->{is_enabled}
&& $user->settings->{use_markdown}->{is_enabled}
&& $user->setting('use_markdown') eq 'on') && $user->setting('use_markdown') eq 'on')
{ {
return $self->SUPER::markdown($text, @_); return $self->SUPER::markdown($text, @_);
......
Bugzilla/Template.pm
View file @ c11b241b
...@@ -813,8 +813,9 @@ sub create { ...@@ -813,8 +813,9 @@ sub create {
my $text = shift; my $text = shift;
return unless $text; return unless $text;
if ((ref($comment) eq 'HASH' && $comment->{is_markdown}) if (Bugzilla->feature('markdown')
|| (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown)) && ((ref($comment) eq 'HASH' && $comment->{is_markdown})
|| (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown)))
{ {
return Bugzilla->markdown->markdown($text); return Bugzilla->markdown->markdown($text);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment