From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 23 Apr 2009 20:26:54 +0000 (-0400)
Subject: avoid using pagespec_match_list here
X-Git-Tag: 3.11~39
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4030f757650a68df220956666f01e575f848daaf

avoid using pagespec_match_list here

I forgot to check if it was called from preprocess, and it is
not; it's called by a format hook. If an error is thrown from
a format hook, wiki build fails, so we don't want that.
---

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 0137476ac..941ed5f36 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -56,9 +56,10 @@ sub genmap ($) {
 
 	# Get all the items to map.
 	my %mapitems = ();
-	foreach my $item (pagespec_match_list([keys %links],
-				$params{pages}, location => $params{page})) {
-		$mapitems{$item}=urlto($item, $params{destpage});
+	foreach my $item (keys %links) {
+		if (pagespec_match($item, $params{pages}, location => $params{page})) {
+			$mapitems{$item}=urlto($item, $params{destpage});
+		}
 	}
 
 	my $dest=$params{page}."/linkmap.png";