X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d67c4817aab8b1ec0d70d453e35c47efd162a5bc..5b8ffe3111737eaf5efe3f5699fcc936b9fd4e62:/IkiWiki/Plugin/brokenlinks.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index a23436fd0..eb698b0be 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,13 +4,22 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "brokenlinks", call => \&getsetup);
 	hook(type => "preprocess", id => "brokenlinks", call => \&preprocess);
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub getsetup {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
@@ -19,24 +28,33 @@ sub preprocess (@) { #{{{
 	add_depends($params{page}, $params{pages});
 	
 	my @broken;
-	foreach my $page (keys %links) {
-		if (pagespec_match($page, $params{pages})) {
-			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,
-					htmllink($page, $params{destpage}, $link, 1).
-					" from ".
-					htmllink($params{page}, $params{destpage}, $page, 1);
-			}
+	foreach my $link (keys %IkiWiki::brokenlinks) {
+		next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
+
+		my @pages;
+		foreach my $page (@{$IkiWiki::brokenlinks{$link}}) {
+			push @pages, $page
+				if pagespec_match($page, $params{pages}, location => $params{page});
 		}
+		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)
+			} @pages)
+		);
 	}
 	
 	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 "<ul>\n"
+		.join("\n",
+			map {
+				"<li>$_</li>"
+			}
+			sort @broken)
+		."</ul>\n";
+}
 
 1