* Set die_on_bad_params => 0 for all templates, to allow users to modify
them without annoyances. * Suck in the page content when generating an inline archive page, to work around the meta plugin's lack of caching of title metadata across runs.master
parent
5a53eca4ca
commit
2eff1c64ab
|
@ -434,6 +434,7 @@ sub template_params (@) { #{{{
|
||||||
},
|
},
|
||||||
filename => "$config{templatedir}/$filename",
|
filename => "$config{templatedir}/$filename",
|
||||||
loop_context_vars => 1,
|
loop_context_vars => 1,
|
||||||
|
die_on_bad_params => 0,
|
||||||
@_;
|
@_;
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
|
|
|
@ -93,8 +93,11 @@ sub preprocess_inline (@) { #{{{
|
||||||
$link=abs2rel($link, dirname($params{page}));
|
$link=abs2rel($link, dirname($params{page}));
|
||||||
$template->param(pageurl => $link);
|
$template->param(pageurl => $link);
|
||||||
$template->param(title => pagetitle(basename($page)));
|
$template->param(title => pagetitle(basename($page)));
|
||||||
$template->param(content => get_inline_content($page, $params{page}))
|
# TODO: if $params{archive} eq "no", the only reason to do this
|
||||||
if $params{archive} eq "no";
|
# is to let the meta plugin get page title info; so stop
|
||||||
|
# calling this next line then once the meta plugin can
|
||||||
|
# store that accross runs.
|
||||||
|
$template->param(content => get_inline_content($page, $params{page}));
|
||||||
$template->param(ctime => displaytime($pagectime{$page}));
|
$template->param(ctime => displaytime($pagectime{$page}));
|
||||||
|
|
||||||
run_hooks(pagetemplate => sub {
|
run_hooks(pagetemplate => sub {
|
||||||
|
@ -169,8 +172,7 @@ sub genrss ($@) { #{{{
|
||||||
|
|
||||||
my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
|
my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
|
||||||
|
|
||||||
my $itemtemplate=template("rssitem.tmpl", blind_cache => 1,
|
my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
|
||||||
die_on_bad_params => 0);
|
|
||||||
my $content="";
|
my $content="";
|
||||||
foreach my $p (@pages) {
|
foreach my $p (@pages) {
|
||||||
next unless exists $renderedfiles{$p};
|
next unless exists $renderedfiles{$p};
|
||||||
|
|
|
@ -14,8 +14,12 @@ ikiwiki (1.17) UNRELEASED; urgency=low
|
||||||
/usr/bin/markdown.
|
/usr/bin/markdown.
|
||||||
* Document in install page how to install markdown, since it has no
|
* Document in install page how to install markdown, since it has no
|
||||||
installation procedure in the upstream tarball.
|
installation procedure in the upstream tarball.
|
||||||
|
* Set die_on_bad_params => 0 for all templates, to allow users to modify
|
||||||
|
them without annoyances.
|
||||||
|
* Suck in the page content when generating an inline archive page, to work
|
||||||
|
around the meta plugin's lack of caching of title metadata across runs.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Wed, 9 Aug 2006 23:50:25 -0400
|
-- Joey Hess <joeyh@debian.org> Sat, 12 Aug 2006 12:30:48 -0400
|
||||||
|
|
||||||
ikiwiki (1.16) unstable; urgency=low
|
ikiwiki (1.16) unstable; urgency=low
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue