Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index a143f24d089d3ff0d405fd0c6f1544558375600c..5a2301af49232943d4f0889c0f3b9ba28f05396f 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -26,13 +26,14 @@ sub preprocess (@) {
        # register a dependency.
        add_depends($params{page}, $params{pages});
        
-       my @pages=keys %pagesources;
-       return $#pages+1 if $params{pages} eq "*"; # optimisation
-       my $count=0;
-       foreach my $page (@pages) {
-               $count++ if pagespec_match($page, $params{pages}, location => $params{page});
+       my @pages;
+       if ($params{pages} eq "*") {
+               @pages=keys %pagesources;
        }
-       return $count;
+       else {
+               @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
+       }
+       return $#pages+1;
 }
 
 1