diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-16 01:14:30 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-16 01:14:30 +0000 |
| commit | 39fd60f1abcba33f3d793185cc0e31fb56441215 (patch) | |
| tree | 13c9873bfe00d7a25e710d3f12c5798a2d5864f5 /IkiWiki | |
| parent | 3b42bd84ca352082489d658cad7debd4b0ef2f8a (diff) | |
* Deal with CPAN installing Markdown as Text::Markdown, while it's
installed as just Markdown by apt.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/mdwn.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index e5228c329..0fc077f5e 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -25,8 +25,11 @@ sub htmlize (@) { #{{{ eval q{use Markdown}; if ($@) { - do "/usr/bin/markdown" || - error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)"); + eval q{use Text::Markdown}; + if ($@) { + do "/usr/bin/markdown" || + error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)"); + } } $markdown_loaded=1; require Encode; |