diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-01-09 14:17:25 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-01-09 14:17:25 -0500 |
| commit | 57ff2ecaeddb3e802fbec50acd7bf286941ec000 (patch) | |
| tree | faadcb090ae0085b4ed0408b1e89815ad5fb7fee /IkiWiki | |
| parent | 5d3c225ad756708e8f3d7d0ee8872a9b274247ef (diff) | |
| download | ikiwiki-57ff2ecaeddb3e802fbec50acd7bf286941ec000.tar ikiwiki-57ff2ecaeddb3e802fbec50acd7bf286941ec000.tar.gz | |
* template: Remove bogus htmlize pass added in 2.16.
* template: Htmlize template variables, but also provide a raw version
via `<TMPL_VAR raw_variable>`.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/template.pm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 27e475ae5..416762fe1 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -46,13 +46,20 @@ sub preprocess (@) { #{{{ } foreach my $param (keys %params) { - $template->param($param => $params{$param}); + if ($template->query(name => $param)) { + $template->param($param => + IkiWiki::htmlize($params{page}, + pagetype($pagesources{$params{page}}), + $params{$param})); + } + if ($template->query(name => "raw_$param")) { + $template->param("raw_$param" => $params{$param}); + } } - return IkiWiki::htmlize($params{page}, pagetype($pagesources{$params{page}}), - IkiWiki::preprocess($params{page}, $params{destpage}, + return IkiWiki::preprocess($params{page}, $params{destpage}, IkiWiki::filter($params{page}, $params{destpage}, - $template->output))); + $template->output)); } # }}} 1 |