change how dependency types are specified to add_depends

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5133c4ba66726ee715e8b927db9441389322692b..be1781520d63029972d05961230f4f230db17634 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -195,9 +195,14 @@ sub preprocess_inline (@) {
 
                @list = map { bestlink($params{page}, $_) }
                        split ' ', $params{pagenames};
+
+               foreach my $p (@list) {
+                       add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
+               }
        }
        else {
-               add_depends($params{page}, $params{pages}, content => ! $quick);
+               add_depends($params{page}, $params{pages},
+                       deptype($quick ? "presence" : "content"));
 
                @list = pagespec_match_list(
                        [ grep { $_ ne $params{page} } keys %pagesources ],
@@ -247,12 +252,6 @@ sub preprocess_inline (@) {
                @list=@list[0..$params{show} - 1];
        }
 
-       # Explicitly add all currently displayed pages as dependencies, so
-       # that if they are removed, the inline will be sure to be updated.
-       foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
-               add_depends($params{page}, $p, content => ! $quick);
-       }
-       
        if ($feeds && exists $params{feedpages}) {
                @feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
        }