X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/485a017a88949b92b59edf49197c4c09be910665..006af093ef45ed02e618dc6d5b2dcaa394f0f92c:/IkiWiki/Plugin/inline.pm diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 56adaf509..935df9a77 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 (also tags plugin). + $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}; @@ -231,7 +233,7 @@ sub pingurl (@) { #{{{ } my $r=$res->value; if (! exists $r->{flerror} || $r->{flerror}) { - debug("Ping rejected: ".$r->{message}); + debug("Ping rejected: ".(exists $r->{message} ? $r->{message} : "[unknown reason]")); } } }