summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorAlbert Ting <altlist@gmail.com>2015-03-09 14:45:48 +0100
committerDavid Lawrence <dkl@mozilla.com>2015-03-09 14:45:48 +0100
commitee27d5356f3459a8d279e3d6b7eaf9d94668f530 (patch)
treefe003f258fab254e683f73a6f2f7506ab90f37da /Bugzilla
parent1f5413655f09c5714ac1b6fe5a34e5b38db3e9f2 (diff)
downloadbugzilla-ee27d5356f3459a8d279e3d6b7eaf9d94668f530.tar.gz
bugzilla-ee27d5356f3459a8d279e3d6b7eaf9d94668f530.tar.xz
Bug 1130691: Support markdown tables
r=dkl,a=glob
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Install/Requirements.pm6
-rw-r--r--Bugzilla/Markdown.pm4
2 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index e9cf230c4..e8a90cab7 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -404,9 +404,9 @@ sub OPTIONAL_MODULES {
# Markdown
{
- package => 'Text-Markdown',
- module => 'Text::Markdown',
- version => '1.0.26',
+ package => 'Text-MultiMarkdown',
+ module => 'Text::MultiMarkdown',
+ version => '1.000035',
feature => ['markdown'],
},
diff --git a/Bugzilla/Markdown.pm b/Bugzilla/Markdown.pm
index ed5608025..e9b0d1a17 100644
--- a/Bugzilla/Markdown.pm
+++ b/Bugzilla/Markdown.pm
@@ -16,7 +16,7 @@ use Bugzilla::Template;
use Digest::MD5 qw(md5_hex);
-use parent qw(Text::Markdown);
+use parent qw(Text::MultiMarkdown);
@Bugzilla::Markdown::EXPORT = qw(new);
@@ -489,7 +489,7 @@ Bugzilla::Markdown - Generates HTML output from structured plain-text input.
Bugzilla::Markdown implements a Markdown engine that produces
an HTML-based output from a given plain-text input.
-The majority of the implementation is done by C<Text::Markdown>
+The majority of the implementation is done by C<Text::MultiMarkdown>
CPAN module. It also applies the linkifications done in L<Bugzilla::Template>
to the input resulting in an output which is a combination of both Markdown
structures and those defined by Bugzilla itself.