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 a259f49ebe386225f982ac30e04d0c3eb5c73015..0c857d125bd1bc544c5a52a44f94a385cec13e08 100644 (file)
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -19,8 +19,8 @@ sub htmlize (@) { #{{{
        return $content if $@;
 
        # don't parse WikiLinks, ikiwiki already does
        return $content if $@;
 
        # don't parse WikiLinks, ikiwiki already does

-       creole_link(sub { return shift });

        creole_customlinks();
        creole_customlinks();

+       creole_custombarelinks();

 
        return creole_parse($content);
 } # }}}
 
        return creole_parse($content);
 } # }}}