* Use Text::Markdown::markdown, since version 1.0.16 of Text::Markdown

[ikiwiki.git] / IkiWiki / Plugin / mdwn.pm

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c087f2b41309f892e52476305bf31ccc48fb7840..cabf44aa57ba11d7516ea3e110a7f39f0f3e450a 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::mdwn;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
        hook(type => "htmlize", id => "mdwn", call => \&htmlize);
@@ -30,7 +30,7 @@ sub htmlize (@) { #{{{
                else {
                        eval q{use Text::Markdown};
                        if (! $@) {
-                               $markdown_sub=\&Text::Markdown::Markdown;
+                               $markdown_sub=\&Text::Markdown::markdown;
                        }
                        else {
                                do "/usr/bin/markdown" ||
@@ -43,9 +43,11 @@ sub htmlize (@) { #{{{
        
        # Workaround for perl bug (#376329)
        $content=Encode::encode_utf8($content);
-       $content=Encode::encode_utf8($content);
-       $content=&$markdown_sub($content);
-       $content=Encode::decode_utf8($content);
+       eval {$content=&$markdown_sub($content)};
+       if ($@) {
+               eval {$content=&$markdown_sub($content)};
+               print STDERR $@ if $@;
+       }
        $content=Encode::decode_utf8($content);
 
        return $content;