* In the aggregator, check for and deal with post filenames that are

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 7fae9a2f2e5ceae2b5f11191bf83f6c835beee0a..e79ce1d810ec09e5591e49357e897c82405249d6 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -7,8 +7,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
 use IkiWiki;
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "brokenlinks",
-               call => \&preprocess);
+       hook(type => "preprocess", id => "brokenlinks", call => \&preprocess);

 } # }}}
 
 sub preprocess (@) { #{{{
 } # }}}
 
 sub preprocess (@) { #{{{


@@ -17,24 +16,24 @@ sub preprocess (@) { #{{{
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.

-       IkiWiki::add_depends($params{page}, $params{pages});
+       add_depends($params{page}, $params{pages});

        
        my @broken;
        
        my @broken;

-       foreach my $page (keys %IkiWiki::links) {
-               if (IkiWiki::pagespec_match($page, $params{pages})) {
-                       foreach my $link (@{$IkiWiki::links{$page}}) {
-                               next if $link =~ /.*\/discussion/i && $IkiWiki::config{discussion};
-                               my $bestlink=IkiWiki::bestlink($page, $link);
+       foreach my $page (keys %links) {
+               if (pagespec_match($page, $params{pages})) {
+                       foreach my $link (@{$links{$page}}) {
+                               next if $link =~ /.*\/discussion/i && $config{discussion};
+                               my $bestlink=bestlink($page, $link);

                                next if length $bestlink;
                                push @broken,
                                next if length $bestlink;
                                push @broken,

-                                       IkiWiki::htmllink($page, $params{destpage}, $link, 1).
-                                       " in ".
-                                       IkiWiki::htmllink($params{page}, $params{destpage}, $page, 1);
+                                       htmllink($page, $params{destpage}, $link, 1).
+                                       " from ".
+                                       htmllink($params{page}, $params{destpage}, $page, 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";
 } # }}}
        my %seen;
        return "<ul>\n".join("\n", map { "<li>$_</li>" } grep { ! $seen{$_}++ } sort @broken)."</ul>\n";
 } # }}}