diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-12 16:36:35 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-12 16:36:35 +0000 |
| commit | 2eff1c64abaab87522a44fef6eac6cab10c95792 (patch) | |
| tree | 338f56102da942e765120674cec9b76512e0406b | |
| parent | 5a53eca4cafc49f86c8b4a579cfa8cea937045b2 (diff) | |
| download | ikiwiki-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.
| -rw-r--r-- | IkiWiki.pm | 1 | ||||
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 10 | ||||
| -rw-r--r-- | debian/changelog | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 0907df6a1..69452792c 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -434,6 +434,7 @@ sub template_params (@) { #{{{ }, filename => "$config{templatedir}/$filename", loop_context_vars => 1, + die_on_bad_params => 0, @_; } #}}} 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}; diff --git a/debian/changelog b/debian/changelog index 59bed84b5..bd653704b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,12 @@ ikiwiki (1.17) UNRELEASED; urgency=low /usr/bin/markdown. * Document in install page how to install markdown, since it has no 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 |