* Change htmlize, format, and sanitize hooks to use named parameters.

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c1f978ad3b99c2c0cd68c5aa75570725e3db8489..2274fea72489b3256cd3d05ee9b0ba7f0dd82d42 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -10,16 +10,25 @@ sub import { #{{{
        IkiWiki::hook(type => "htmlize", id => "mdwn", call => \&htmlize);
 } # }}}
 
-sub htmlize ($) { #{{{
-       my $content = shift;
+my $markdown_loaded=0;
+sub htmlize (@) { #{{{
+       my %params=@_;
+       my $content = $params{content};
 
-       if (! $INC{"/usr/bin/markdown"}) {
-               # Note: a proper perl module is available in Debian
+       if (! $markdown_loaded) {
+               # Note: This hack to make markdown run as a proper perl
+               # module. A proper perl module is available in Debian
                # for markdown, but not upstream yet.
                no warnings 'once';
                $blosxom::version="is a proper perl module too much to ask?";
                use warnings 'all';
-               do "/usr/bin/markdown" || IkiWiki::error("failed to load /usr/bin/markdown: $!");
+
+               eval q{use Markdown};
+               if ($@) {
+                       do "/usr/bin/markdown" ||
+                               IkiWiki::error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+               }
+               $markdown_loaded=1;
                require Encode;
        }