X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/be032a7b87d1080f1a54327346cb5b40432a056c..414ccfb1e298a722d2afa8b8540ca84dc1ccc6f2:/IkiWiki/Plugin/pagecount.pm?ds=inline

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 80561350b..dd5de3c83 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -15,25 +15,26 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
 sub preprocess (@) {
 	my %params=@_;
-	$params{pages}="*" unless defined $params{pages};
+	my $pages=defined $params{pages} ? $params{pages} : "*";
 	
-	# Needs to update count whenever a page is added or removed, so
-	# register a presence dependency.
-	add_depends($params{page}, $params{pages}, presence => 1);
-	
-	my @pages;
-	if ($params{pages} eq "*") {
-		@pages=keys %pagesources;
-	}
-	else {
-		@pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
+	# Just get a list of all the pages, and count the items in it.
+	# Use a presence dependency to only update when pages are added
+	# or removed.
+
+	if ($pages eq '*') {
+		# optimisation to avoid needing to try matching every page
+		add_depends($params{page}, $pages, deptype("presence"));
+		return scalar keys %pagesources;
 	}
-	return $#pages+1;
+
+	return scalar pagespec_match_list($params{page}, $pages,
+		deptype => deptype("presence"));
 }
 
 1