Merge branch 'master' of git://git.ikiwiki.info

1 files changed, 14 insertions, 23 deletions

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index cf8f25281..8ee734bf9 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -23,36 +23,27 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is added or removed, so
-	# register a dependency.
-	add_depends($params{page}, $params{pages});
-	
-	my %broken;
-	foreach my $page (pagespec_match_list([keys %links],
-			$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{$link}}, $page;
-		}
-	}
-
 	my @broken;
-	foreach my $link (keys %broken) {
-		my $page=$broken{$link}->[0];
+	foreach my $link (keys %IkiWiki::brokenlinks) {
+		next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
+
+		my @pages=pagespec_match_list($params{page}, $params{pages},
+			list => $IkiWiki::brokenlinks{$link},
+			# needs to update when links on a page change
+			deptype => deptype("links")
+		);
+		next unless @pages;
+
+		my $page=$IkiWiki::brokenlinks{$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}}));
+			} @pages)
+		);
 	}
 	
-	return gettext("There are no broken links!") unless %broken;
+	return gettext("There are no broken links!") unless @broken;
 	return "<ul>\n"
 		.join("\n",
 			map {