diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-13 17:35:14 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-13 17:35:14 +0000 |
| commit | b4dafe467be5f6c885204887aeae2f4d513b3640 (patch) | |
| tree | af85d28ee38f184b1ae5703b11ac6468d5059300 | |
| parent | 7d6be3e5406b48047a47d2b7ea7acb471f9e5386 (diff) | |
* Change yet again how unhandled and escaped preprocessor directives are
re-output onto the page. Hopefully I finally got it right..
| -rw-r--r-- | IkiWiki.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 |
3 files changed, 6 insertions, 4 deletions
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" |