aboutsummaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorKoosha KM <koosha.khajeh@gmail.com>2014-09-11 13:55:01 +0000
committerDavid Lawrence <dkl@mozilla.com>2014-09-11 13:55:01 +0000
commitc11b241b985511c01803df200d31afb793f11903 (patch)
tree2a0ab29fd9f6ea126813b7e98cb1164931534cde /Bugzilla
parente1603d01bbc3523b622db2f295400aa5a5f14509 (diff)
downloadbugs-c11b241b985511c01803df200d31afb793f11903.tar
bugs-c11b241b985511c01803df200d31afb793f11903.tar.gz
bugs-c11b241b985511c01803df200d31afb793f11903.tar.bz2
bugs-c11b241b985511c01803df200d31afb793f11903.tar.xz
bugs-c11b241b985511c01803df200d31afb793f11903.zip
Bug 1064933: Bugzilla.pm does not compile without Text::Markdown
r=glob,a=sgreen
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Markdown.pm3
-rw-r--r--Bugzilla/Template.pm5
2 files changed, 4 insertions, 4 deletions
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);
}