* Htmlize parameters passed to the template preprocessor directive before

inserting them into the html template. This ensures that markdown
  acts on them, even if the value is expanded inside a block-level html
  element in the html template. Closes: #454058
* Use a div in the note template rather than a span.
master
Joey Hess 2007-12-12 16:42:54 -05:00
parent b10c46a1f3
commit 7eafa95f33
3 changed files with 10 additions and 4 deletions

View File

@ -49,9 +49,10 @@ sub preprocess (@) { #{{{
$template->param($param => $params{$param});
}
return IkiWiki::preprocess($params{page}, $params{destpage},
return IkiWiki::htmlize($params{page}, pagetype($pagesources{$params{page}}),
IkiWiki::preprocess($params{page}, $params{destpage},
IkiWiki::filter($params{page}, $params{destpage},
$template->output));
$template->output)));
} # }}}
1

5
debian/changelog vendored
View File

@ -29,6 +29,11 @@ ikiwiki (2.16) UNRELEASED; urgency=low
cached value.
* Preserve input file modification times in output files.
* Allow dashes in preprocessor directive commands, and shortcuts.
* Htmlize parameters passed to the template preprocessor directive before
inserting them into the html template. This ensures that markdown
acts on them, even if the value is expanded inside a block-level html
element in the html template. Closes: #454058
* Use a div in the note template rather than a span.
-- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500

View File

@ -1,6 +1,6 @@
<span class="notebox">
<div class="notebox">
<TMPL_VAR text>
</span>
</div>
<TMPL_UNLESS NAME="text">
Use this template to insert a note into a page. The note will be styled to
float to the right of other text on the page. This template has one