X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..07a1796d3bf52bca9a325cf517f742ff44b49921:/IkiWiki/Plugin/brokenlinks.pm

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 225d8d829..fa34a7008 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);
@@ -20,20 +20,21 @@ sub preprocess (@) { #{{{
 	
 	my @broken;
 	foreach my $page (keys %links) {
-		if (pagespec_match($page, $params{pages})) {
+		if (pagespec_match($page, $params{pages}, location => $params{page})) {
+			my $discussion=gettext("discussion");
 			foreach my $link (@{$links{$page}}) {
-				next if $link =~ /.*\/discussion/i && $config{discussion};
+				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).
-					" in ".
-					htmllink($params{page}, $params{destpage}, $page, 1);
+					htmllink($page, $params{destpage}, $link, noimageinline => 1).
+					" from ".
+					htmllink($params{page}, $params{destpage}, $page, noimageinline => 1);
 			}
 		}
 	}
 	
-	return "There are no broken links!" unless @broken;
+	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";
 } # }}}