summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-06-19 19:54:46 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-06-19 19:54:46 -0400
commit1b6b4da3a3fd34b7ac9bf3d7e7928af4bc35b81f (patch)
tree58c9c80258a220a6f5af66678b5516c1826989bb /IkiWiki
parent98095ccac43b4b82d95bd8fd0ce3c8c16a325b22 (diff)
avoid creole parsing wikilinks
ikiwiki already does, and escaped links should not be processed by creole after ikiwiki de-escapes them
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/creole.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index f7f7a61e3..a259f49eb 100644
--- 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