From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 00:54:06 +0000 (-0400)
Subject: fix feedpages dependency
X-Git-Tag: 3.20091017~27^2~59
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57d04ed892588cbb49bfa81e2453e88388e67441;p=ikiwiki.git

fix feedpages dependency

This dependency was missing before switching to use_pagespec.
It is correct to add it, but it needs to be combined with the regular
"pages" dependency to ensure that it does not match extra pages.

(Also fixed its dependency type.)
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 748e02df4..c02137aed 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -245,7 +245,8 @@ sub preprocess_inline (@) {
 	}
 
 	if ($feeds && exists $params{feedpages}) {
-		@feedlist = use_pagespec($params{page}, $params{feedpages},
+		@feedlist = use_pagespec($params{page}, "($params{pages}) and ($params{feedpages})",
+			deptype => deptype($quick ? "presence" : "content"),
 			list => \@feedlist);
 	}