X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5e7b2dea84a35163b599b88efc02cd7ef3e0ad46..0a2e4e167dc0a6b9fc0b038c4174694117b74628:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 815a37838..553fd350c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -218,7 +218,7 @@ sub preprocess_inline (@) {
 
 		@list = pagespec_match_list($params{page}, $params{pages},
 			deptype => deptype($quick ? "presence" : "content"),
-			limit => sub { $_[0] ne $params{page} },
+			filter => sub { $_[0] eq $params{page} },
 			sort => exists $params{sort} ? $params{sort} : "age",
 			reverse => yesno($params{reverse}),
 			num => $num,
@@ -337,7 +337,8 @@ sub preprocess_inline (@) {
 			my $file = $pagesources{$page};
 			my $type = pagetype($file);
 			if (! $raw || ($raw && ! defined $type)) {
-				unless ($archive && $quick) {
+				if (!($archive && $quick) &&
+				    $template->query(name => 'content')) {
 					# Get the content before populating the
 					# template, since getting the content uses
 					# the same template if inlines are nested.