X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fa52a730ff3b30c7d2cdd8cd5f9c8c25a0c0a2a5..2bd8ada5a619a1c32bf19f44e4f96e083ceb17b8:/IkiWiki/Plugin/brokenlinks.pm

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index d9d50f75f..0295a8fe6 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "preprocess", id => "brokenlinks", call => \&preprocess);
@@ -18,25 +18,40 @@ sub preprocess (@) { #{{{
 	# register a dependency.
 	add_depends($params{page}, $params{pages});
 	
-	my @broken;
+	my %broken;
 	foreach my $page (keys %links) {
-		if (pagespec_match($page, $params{pages}, $params{page})) {
+		if (pagespec_match($page, $params{pages}, location => $params{page})) {
 			my $discussion=gettext("discussion");
+			my %seen;
 			foreach my $link (@{$links{$page}}) {
+				next if $seen{$link};
+				$seen{$link}=1;
 				next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
 				my $bestlink=bestlink($page, $link);
 				next if length $bestlink;
-				push @broken,
-					htmllink($page, $params{destpage}, $link, noimageinline => 1).
-					" from ".
-					htmllink($params{page}, $params{destpage}, $page, noimageinline => 1);
+				push @{$broken{$link}}, $page;
 			}
 		}
 	}
+
+	my @broken;
+	foreach my $link (keys %broken) {
+		my $page=$broken{$link}->[0];
+		push @broken, sprintf(gettext("%s from %s"),
+			htmllink($page, $params{destpage}, $link, noimageinline => 1),
+			join(", ", map {
+				htmllink($params{page}, $params{destpage}, $_, 	noimageinline => 1)
+			} @{$broken{$link}}));
+	}
 	
-	return gettext("There are no broken links!") unless @broken;
-	my %seen;
-	return "<ul>\n".join("\n", map { "<li>$_</li>" } grep { ! $seen{$_}++ } sort @broken)."</ul>\n";
+	return gettext("There are no broken links!") unless %broken;
+	return "<ul>\n"
+		.join("\n",
+			map {
+				"<li>$_</li>"
+			}
+			sort @broken)
+		."</ul>\n";
 } # }}}
 
 1