summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-10-08 20:54:06 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-10-08 20:55:12 -0400
commit57d04ed892588cbb49bfa81e2453e88388e67441 (patch)
treecd5678d69c7feaf4ad515e4a5e59f2b3aee7a4f5
parent37ec6a82433aa1d7030bca7cae9d3813a6bdbd1f (diff)
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.)
-rw-r--r--IkiWiki/Plugin/inline.pm3
1 files changed, 2 insertions, 1 deletions
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);
}