* 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.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0907df6a116eb7eecb5d53b479fd38bec77e7626..69452792c8d8e6cb75a1e21cb530e49a480e05d0 100644 (file)
--- 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 56adaf509574e214bc01bb93c5859125fa165de1..c98888452b43ec79e302109b38c402174750935d 100644 (file)
--- 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 59bed84b54f6bbc9b37a4c7b698271cd4c7914e4..bd653704b9f12e8ebe9b47914564e8fe601ccc08 100644 (file)
--- 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