X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d76c73eb8634f3181bd246d747ae42443d4b6d31..e8ec0187dad6eb81e71fedfaefced2dc2f6b2fda:/IkiWiki/Plugin/pagestats.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 34fd11715..de559e2c5 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -33,8 +33,8 @@ sub preprocess (@) { #{{{
 	
 	my %counts;
 	my $max = 0;
-	foreach my $page (%IkiWiki::links) {
-		if (IkiWiki::globlist_match($page, $params{pages})) {
+	foreach my $page (keys %IkiWiki::links) {
+		if (IkiWiki::pagespec_match($page, $params{pages})) {
 			my @bl = IkiWiki::backlinks($page);
 			$counts{$page} = scalar(@bl);
 			$max = $counts{$page} if $counts{$page} > $max;
@@ -42,18 +42,23 @@ sub preprocess (@) { #{{{
 	}
 
 	if ($style eq 'table') {
-		return "<table class='pageStats'>\n".join("\n", map { "<tr><td>$_</td><td>".$counts{$_}."</td></tr>" }
-		      sort { $counts{$b} <=> $counts{$a} } keys %counts)."\n</table>\n" ;
+		return "<table class='pageStats'>\n".
+			join("\n", map {
+				"<tr><td>".
+				IkiWiki::htmllink($params{page}, $params{destpage}, $_, 1).
+				"</td><td>".$counts{$_}."</td></tr>"
+			}
+			sort { $counts{$b} <=> $counts{$a} } keys %counts).
+			"\n</table>\n" ;
 	} else {
 		# In case of misspelling, default to a page cloud
 
 		my $res = "<div class='pagecloud'>\n";
 		foreach my $page (sort keys %counts) {
 			my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)];
-			my $link = IkiWiki::abs2rel(IkiWiki::htmlpage($page), IkiWiki::dirname($params{page}));
-			$res .= sprintf("<span class='%s'><a href='%s'>%s</a></span>\n",
-					$class, $link, $page);
-				
+			$res .= "<span class=\"$class\">".
+			        IkiWiki::htmllink($params{page}, $params{destpage}, $page).
+			        "</span>\n";
 		}
 		$res .= "</div>\n";