* Set die_on_bad_params => 0 for all templates, to allow users to modify

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4e64d9f8cc088ec337475e771a644ec5820a8daa..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 {
@@ -138,7 +141,11 @@ sub date_822 ($) { #{{{
        my $time=shift;
 
        eval q{use POSIX};
-       return POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+       my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+       POSIX::setlocale(&POSIX::LC_TIME, "C");
+       my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+       POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+       return $ret;
 } #}}}
 
 sub absolute_urls ($$) { #{{{
@@ -165,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};