oops

[git.ikiwiki.info.git] / IkiWiki / Plugin / brokenlinks.pm

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 75c819d761d871d1c73948138a765a01463ecbb4..7fae9a2f2e5ceae2b5f11191bf83f6c835beee0a 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -7,7 +7,8 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-       IkiWiki::register_plugin("preprocess", "brokenlinks", \&preprocess);
+       IkiWiki::hook(type => "preprocess", id => "brokenlinks",
+               call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -19,22 +20,23 @@ sub preprocess (@) { #{{{
        IkiWiki::add_depends($params{page}, $params{pages});
        
        my @broken;
-       foreach my $page (%IkiWiki::links) {
-               if (IkiWiki::globlist_match($page, $params{pages})) {
+       foreach my $page (keys %IkiWiki::links) {
+               if (IkiWiki::pagespec_match($page, $params{pages})) {
                        foreach my $link (@{$IkiWiki::links{$page}}) {
-                               next if $link =~ /.*\/discussion/i;
+                               next if $link =~ /.*\/discussion/i && $IkiWiki::config{discussion};
                                my $bestlink=IkiWiki::bestlink($page, $link);
                                next if length $bestlink;
                                push @broken,
-                                       IkiWiki::htmllink($page, $link, 1).
+                                       IkiWiki::htmllink($page, $params{destpage}, $link, 1).
                                        " in ".
-                                       IkiWiki::htmllink($params{page}, $page, 1);
+                                       IkiWiki::htmllink($params{page}, $params{destpage}, $page, 1);
                        }
                }
        }
        
        return "There are no broken links!" unless @broken;
-       return "<ul>\n".join("\n", map { "<li>$_</li>" } sort @broken)."</ul>\n";
+       my %seen;
+       return "<ul>\n".join("\n", map { "<li>$_</li>" } grep { ! $seen{$_}++ } sort @broken)."</ul>\n";
 } # }}}
 
 1