X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2794d7ef5abc4fa8fc2eb42d5c85ada197df0767..d3008b626ea6130d3b75662725f6f2c412fc71ea:/IkiWiki/Plugin/pagecount.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index cfc962b6c..2c20ca195 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -1,14 +1,12 @@
 #!/usr/bin/perl
-# Provides [[pagecount ]] to count the number of pages.
 package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "pagecount", 
-		call => \&preprocess);
+	hook(type => "preprocess", id => "pagecount", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -17,13 +15,13 @@ sub preprocess (@) { #{{{
 	
 	# Needs to update count whenever a page is added or removed, so
 	# register a dependency.
-	IkiWiki::add_depends($params{page}, $params{pages});
+	add_depends($params{page}, $params{pages});
 	
-	my @pages=keys %IkiWiki::pagesources;
+	my @pages=keys %pagesources;
 	return $#pages+1 if $params{pages} eq "*"; # optimisation
 	my $count=0;
 	foreach my $page (@pages) {
-		$count++ if IkiWiki::pagespec_match($page, $params{pages});
+		$count++ if pagespec_match($page, $params{pages}, location => $params{page});
 	}
 	return $count;
 } # }}}