summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/template.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2007-12-12 16:42:54 -0500
committerJoey Hess <joey@kitenet.net>2007-12-12 16:42:54 -0500
commit7eafa95f33d4429054d13e6ade54d112c02ba0e1 (patch)
tree994e9e7c121b25edee247e6bcf44e6bbe739b0b9 /IkiWiki/Plugin/template.pm
parentb10c46a1f3b9fadfb3cf6f1129e748bfc742ea44 (diff)
* 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.
Diffstat (limited to 'IkiWiki/Plugin/template.pm')
-rw-r--r--IkiWiki/Plugin/template.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index c87ba5102..27e475ae5 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -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