* 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.

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index c87ba51029434acca2d3dd94ffd9389cec8e1231..27e475ae5339971027fd821f9ef2a9c36f7ec3fa 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -49,9 +49,10 @@ sub preprocess (@) { #{{{
                $template->param($param => $params{$param});
        }
 
                $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},
                IkiWiki::filter($params{page}, $params{destpage},

-               $template->output));
+               $template->output)));

 } # }}}
 
 1
 } # }}}
 
 1

diff --git a/debian/changelog b/debian/changelog
index 8c8f4aa9573ba3d8d04777010f9175a64f569d2c..0df68b2fc1dcbdd65fa2254b7827d7b2151281f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
     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
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
 

diff --git a/doc/templates/note.mdwn b/doc/templates/note.mdwn
index d992e023606cb39a58c169ab1986801a1e3f6616..4cc323c0e037204f170ae06596e1cb85efe93eb7 100644 (file)
--- a/doc/templates/note.mdwn
+++ b/doc/templates/note.mdwn
@@ -1,6 +1,6 @@
-<span class="notebox">
+<div class="notebox">

 <TMPL_VAR text>
 <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
 <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