Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index f7f7a61e3dd369821c00200281016df557b69552..0c857d125bd1bc544c5a52a44f94a385cec13e08 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 $@;
 
        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
 } # }}}
 
 1