Merge branch 'master' into comments

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

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index a259f49ebe386225f982ac30e04d0c3eb5c73015..7c729300d9a7e964a72dd137e67a6e42e3fc9991 100644 (file)
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -8,9 +8,18 @@ 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};
@@ -19,8 +28,8 @@ sub htmlize (@) { #{{{
        return $content if $@;
 
        # don't parse WikiLinks, ikiwiki already does
-       creole_link(sub { return shift });
        creole_customlinks();
+       creole_custombarelinks();
 
        return creole_parse($content);
 } # }}}