Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 5c46c565cc7b95100c3124fa9a3c496bb4afc502..c47ccb7b1aded4ea75f096122a39000bda34cdd1 100644 (file)
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,17 +4,28 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
-use IkiWiki;
-use Text::WikiFormat;
+use IkiWiki 2.00;
 
 sub import { #{{{
-       IkiWiki::hook(type => "htmlize", id => "wiki", call => \&htmlize);
+       hook(type => "getsetup", id => "wiki", call => \&getsetup);
+       hook(type => "htmlize", id => "wiki", call => \&htmlize);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 0, # format plugin
+                       rebuild => undef,
+               },
+} #}}}
+
+
 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 });
 } # }}}