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

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index f7f7a61e3dd369821c00200281016df557b69552..a259f49ebe386225f982ac30e04d0c3eb5c73015 100644 (file)
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -17,7 +17,12 @@ sub htmlize (@) { #{{{
 
        eval q{use Text::WikiCreole};
        return $content if $@;
-       return Text::WikiCreole::creole_parse($content);
+
+       # don't parse WikiLinks, ikiwiki already does
+       creole_link(sub { return shift });
+       creole_customlinks();
+
+       return creole_parse($content);
 } # }}}
 
 1