X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/98095ccac43b4b82d95bd8fd0ce3c8c16a325b22..44ca50db9d87142d860b1d9d959a27ede0402b0d:/IkiWiki/Plugin/creole.pm

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index f7f7a61e3..7c729300d 100644
--- 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