diff options
| -rw-r--r-- | IkiWiki.pm | 9 | ||||
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index b47da966e..43ffb1fd8 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1255,9 +1255,10 @@ sub preprocess ($$$;$$) { ); }; if ($@) { - chomp $@; + my $error=$@; + chomp $error; $ret="[[!$command <span class=\"error\">". - gettext("Error").": $@"."</span>]]"; + gettext("Error").": $error"."</span>]]"; } } else { @@ -2055,7 +2056,7 @@ sub match_created_before ($$;@) { } } else { - return IkiWiki::FailReason->new("$testpage has no ctime"); + return IkiWiki::ErrorReason->new("$testpage does not exist"); } } @@ -2075,7 +2076,7 @@ sub match_created_after ($$;@) { } } else { - return IkiWiki::FailReason->new("$testpage has no ctime"); + return IkiWiki::ErrorReason->new("$testpage does not exist"); } } diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 704fa711d..3a2f4b7bc 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -254,7 +254,7 @@ sub preprocess_inline (@) { add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist)); if ($feeds && exists $params{feedpages}) { - @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist; + @feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page}); } my ($feedbase, $feednum); |