summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm2
-rw-r--r--debian/changelog3
2 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8da2ddde4..b4c588c3a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -606,7 +606,7 @@ sub preprocess ($$$;$$) { #{{{
my $command=shift;
my $params=shift;
if (length $escape) {
- return "[[$command $params]]";
+ return "\\[[$command $params]]";
}
elsif (exists $hooks{preprocess}{$command}) {
return "" if $scan && ! $hooks{preprocess}{$command}{scan};
diff --git a/debian/changelog b/debian/changelog
index bccab6f24..66d146466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ikiwiki (2.5) UNRELEASED; urgency=low
* Wrap the editpage template in the standard misctemplate, this allows the
pagetemplate hook to work for that page.
* Above change fixes the favicon plugin to work on edit pages.
+ * Correct some issues with escaped preprocessor directives.
- -- Joey Hess <joeyh@debian.org> Mon, 16 Jul 2007 01:11:03 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 20 Jul 2007 13:54:02 -0400
ikiwiki (2.4) unstable; urgency=low