aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-12 16:36:35 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-12 16:36:35 +0000
commit2eff1c64abaab87522a44fef6eac6cab10c95792 (patch)
tree338f56102da942e765120674cec9b76512e0406b /IkiWiki
parent5a53eca4cafc49f86c8b4a579cfa8cea937045b2 (diff)
downloadikiwiki-2eff1c64abaab87522a44fef6eac6cab10c95792.tar
ikiwiki-2eff1c64abaab87522a44fef6eac6cab10c95792.tar.gz
* 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.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/inline.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 56adaf509..c98888452 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -93,8 +93,11 @@ sub preprocess_inline (@) { #{{{
$link=abs2rel($link, dirname($params{page}));
$template->param(pageurl => $link);
$template->param(title => pagetitle(basename($page)));
- $template->param(content => get_inline_content($page, $params{page}))
- if $params{archive} eq "no";
+ # TODO: if $params{archive} eq "no", the only reason to do this
+ # 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}));
run_hooks(pagetemplate => sub {
@@ -169,8 +172,7 @@ sub genrss ($@) { #{{{
my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
- my $itemtemplate=template("rssitem.tmpl", blind_cache => 1,
- die_on_bad_params => 0);
+ my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
my $content="";
foreach my $p (@pages) {
next unless exists $renderedfiles{$p};