Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index f7f7a61e3dd369821c00200281016df557b69552..7c729300d9a7e964a72dd137e67a6e42e3fc9991 100644 (file)
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -8,16 +8,30 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "creole", call => \&getsetup);
        hook(type => "htmlize", id => "creole", call => \&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