X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/98095ccac43b4b82d95bd8fd0ce3c8c16a325b22..414ccfb1e298a722d2afa8b8540ca84dc1ccc6f2:/IkiWiki/Plugin/creole.pm?ds=inline

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index f7f7a61e3..a1e4b31d3 100644
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -5,19 +5,34 @@ 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
+			section => "format",
+		},
+}
+
+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