Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index b8ed2b8de58e05d985a7e45985cbf2e628714b3a..2318298fe4726c31017c250cf5b57c96b8866640 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -23,19 +23,15 @@ 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 changed, 
-       # added or removed, in order to see the link changes.
-       add_depends($params{page}, $params{pages});
-       

        my @broken;
        foreach my $link (keys %IkiWiki::brokenlinks) {
                next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion};
 
        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});
-               }
+               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];
                next unless @pages;
 
                my $page=$IkiWiki::brokenlinks{$link}->[0];


@@ -43,7 +39,7 @@ sub preprocess (@) {
                        htmllink($page, $params{destpage}, $link, noimageinline => 1),
                        join(", ", map {
                                htmllink($params{page}, $params{destpage}, $_,  noimageinline => 1)
                        htmllink($page, $params{destpage}, $link, noimageinline => 1),
                        join(", ", map {
                                htmllink($params{page}, $params{destpage}, $_,  noimageinline => 1)

-                       } @pages)
+                       } sort @pages)

                );
        }
        
                );
        }