diff options
| -rw-r--r-- | IkiWiki/Plugin/template.pm | 1 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 1a4faf05f..3d088289d 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -32,6 +32,7 @@ sub preprocess (@) { #{{{ filter => sub { my $text_ref = shift; $$text_ref=&Encode::decode_utf8($$text_ref); + chomp $$text_ref; }, filename => srcfile($template_file), die_on_bad_params => 0, diff --git a/debian/changelog b/debian/changelog index 13c9adb3a..de9f64cdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,7 @@ ikiwiki (1.27) UNRELEASED; urgency=low * Add a stub local.css to avoid problems with 404's. * Patch from Recai to fix a wide character warning from the search plugin during setup if the wikiname contains utf8. - * Yet another fix for those poor case-insensative OSX users. + * Yet another fix for those poor case-insensative `OSX users. * pagetemplate hooks are now also called when generating cgi pages. * Add a favicon plugin, which simply adds a link tag for an icon to each page (and cgis). @@ -47,8 +47,11 @@ ikiwiki (1.27) UNRELEASED; urgency=low * Updated ikiwiki.svgz from Recai, includes an icon and is used to generate a multi-resolution favicon.ico. * README.Debian: typo Closes: #388110 + * chomp trailing newlines at the end of templates read in by the template + plugin, to allow use of the template preprocessor directive in + whitespace-sensative situations. Closes: #387073 - -- Joey Hess <joeyh@debian.org> Mon, 18 Sep 2006 14:03:42 -0400 + -- Joey Hess <joeyh@debian.org> Mon, 18 Sep 2006 15:26:01 -0400 ikiwiki (1.26) unstable; urgency=low |