X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0df2ad5dfe1d896520eceabfe362891f68ed3165..07ef42afee4c10722610c8ca2b3998d88af32abc:/IkiWiki/Plugin/mdwn.pm

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c871e2a4d..2ffe7bc3e 100644
--- 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,11 +30,16 @@ sub htmlize (@) { #{{{
 		else {
 			eval q{use Text::Markdown};
 			if (! $@) {
-				$markdown_sub=\&Text::Markdown::Markdown;
+				if (Text::Markdown->can('markdown')) {
+					$markdown_sub=\&Text::Markdown::markdown;
+				}
+				else {
+					$markdown_sub=\&Text::Markdown::Markdown;
+				}
 			}
 			else {
 				do "/usr/bin/markdown" ||
-					error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+					error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!));
 				$markdown_sub=\&Markdown::Markdown;
 			}
 		}
@@ -43,9 +48,11 @@ sub htmlize (@) { #{{{
 	
 	# Workaround for perl bug (#376329)
 	$content=Encode::encode_utf8($content);
-	$content=Encode::encode_utf8($content);
-	$content=Markdown::Markdown($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;