Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 9fa87dafb1c06902bdcc58e230f7c53f2325fe94..c47ccb7b1aded4ea75f096122a39000bda34cdd1 100644 (file)
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,16 +4,28 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
-use Text::WikiFormat;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 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 htmlize ($) { #{{{
-       my $content = shift;
+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 });
 } # }}}
 
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}