Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index f7f7a61e3dd369821c00200281016df557b69552..425e71043f0133f5b855c32932bc114542c83d7d 100644 (file)
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -5,19 +5,33 @@ package IkiWiki::Plugin::creole;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "creole", call => \&getsetup);
        hook(type => "htmlize", id => "creole", call => \&htmlize);
-} # }}}
+}
 
-sub htmlize (@) { #{{{
+sub getsetup {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
+}
+
+sub htmlize (@) {
        my %params=@_;
        my $content = $params{content};
 
        eval q{use Text::WikiCreole};
        return $content if $@;
-       return Text::WikiCreole::creole_parse($content);
-} # }}}
+
+       # don't parse WikiLinks, ikiwiki already does
+       creole_customlinks();
+       creole_custombarelinks();
+
+       return creole_parse($content);
+}
 
 1