X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b2bd444f31fd9f294ee0dbc4b9a61b1e8c04055c..723a10b5b16d87f118bea4c6afaa8d5f60ba5947:/IkiWiki/Plugin/brokenlinks.pm?ds=inline

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 50bbe0d54..ef5837a58 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,11 +4,10 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "brokenlinks",
-		call => \&preprocess);
+	hook(type => "preprocess", id => "brokenlinks", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -17,25 +16,39 @@ sub preprocess (@) { #{{{
 	
 	# Needs to update 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 @broken;
-	foreach my $page (%IkiWiki::links) {
-		if (IkiWiki::globlist_match($page, $params{pages})) {
-			foreach my $link (@{$IkiWiki::links{$page}}) {
-				next if $link =~ /.*\/discussion/i && $IkiWiki::config{discussion};
-				my $bestlink=IkiWiki::bestlink($page, $link);
+	my %broken;
+	foreach my $page (keys %links) {
+		if (pagespec_match($page, $params{pages}, location => $params{page})) {
+			my $discussion=gettext("discussion");
+			foreach my $link (@{$links{$page}}) {
+				next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
+				my $bestlink=bestlink($page, $link);
 				next if length $bestlink;
-				push @broken,
-					IkiWiki::htmllink($page, $link, 1).
-					" in ".
-					IkiWiki::htmllink($params{page}, $page, 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 "There are no broken links!" unless @broken;
-	return "<ul>\n".join("\n", map { "<li>$_</li>" } 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