Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / IkiWiki / Plugin / wikitext.pm

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 8b8cbe75e7711c3d17abe7f94ecedfca94f99d16..e1d346ae67d19962fc732759e540c17776d8f2a6 100644 (file)
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,15 +4,18 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
-use Text::WikiFormat;
+use IkiWiki 2.00;
 
 sub import { #{{{
-       IkiWiki::hook(type => "htmlize", id => "wiki", call => \&htmlize);
+       hook(type => "htmlize", id => "wiki", call => \&htmlize);
 } # }}}
 
-sub htmlize ($) { #{{{
-       my $content = shift;
+sub htmlize (@) { #{{{
+       my %params=@_;
+       my $content = $params{content};
 
+       eval q{use Text::WikiFormat};
+       return $content if $@;
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}