Merge branch 'dependency-types' into transitive-dependencies

[ikiwiki.git] / IkiWiki / Plugin / pagecount.pm

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 1955603b023d84315e6c9487ea095a93ca6a6afe..17eda06181ac19fe00ee2de2b2f52fb336980d49 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -23,11 +23,16 @@ sub preprocess (@) {
        $params{pages}="*" unless defined $params{pages};
        
        # Needs to update count whenever a page is added or removed, so
-       # register a dependency.
-       add_depends($params{page}, $params{pages});
+       # register a contentless dependency.
+       add_depends($params{page}, $params{pages}, content => 0);
        
-       my @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page})
-               if $params{pages} ne "*"; # optimisation;
+       my @pages;
+       if ($params{pages} eq "*") {
+               @pages=keys %pagesources;
+       }
+       else {
+               @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
+       }
        return $#pages+1;
 }