Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index bf0d7560dbc8a86a28b1ad694d9de326d0153f1f..9e65f52c656f55dd201c6b2abba6fd5f9419e3a8 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -23,37 +23,30 @@ sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        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});
+       # Needs to update whenever the links on a page change.
+       add_depends($params{page}, $params{pages}, links => 1);

        
        

-       my %broken;
-       foreach my $page (keys %links) {
-               if (pagespec_match($page, $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 %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 @broken;
-       foreach my $link (keys %broken) {
-               my $page=$broken{$link}->[0];
+               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)
                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 {
        return "<ul>\n"
                .join("\n",
                        map {