From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 13 Aug 2007 17:35:14 +0000 (+0000)
Subject: * Change yet again how unhandled and escaped preprocessor directives are
X-Git-Tag: 2.6~144
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4dafe467be5f6c885204887aeae2f4d513b3640;p=ikiwiki.git

* Change yet again how unhandled and escaped preprocessor directives are
  re-output onto the page. Hopefully I finally got it right..
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7c35ce2b5..37c73cb9f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -626,7 +626,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};
@@ -687,7 +687,7 @@ sub preprocess ($$$;$$) { #{{{
 			return $ret;
 		}
 		else {
-			return "\\[[$command $params]]";
+			return "[[$command $params]]";
 		}
 	};
 	
diff --git a/debian/changelog b/debian/changelog
index aa470507e..0605e1191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
   * Fix --libdir to work at the command line.
   * Plugins can now be written as standalone external programs, which can
     be written in any language that can do XML RPC.
+  * Change yet again how unhandled and escaped preprocessor directives are
+    re-output onto the page. Hopefully I finally got it right..
 
- -- Joey Hess <joeyh@debian.org>  Sun, 12 Aug 2007 20:49:23 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 13 Aug 2007 13:34:29 -0400
 
 ikiwiki (2.5) unstable; urgency=low
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index b4a3b70ec..48efd64e5 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-12 22:57-0400\n"
+"POT-Creation-Date: 2007-08-13 13:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"