X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2794d7ef5abc4fa8fc2eb42d5c85ada197df0767..40959ce76d159cefaf0431ad2cc61ad35a9f99b1:/IkiWiki/Plugin/orphans.pm diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 2219634ca..3a0150d53 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -4,11 +4,10 @@ package IkiWiki::Plugin::orphans; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; sub import { #{{{ - IkiWiki::hook(type => "preprocess", id => "orphans", - call => \&preprocess); + hook(type => "preprocess", id => "orphans", call => \&preprocess); } # }}} sub preprocess (@) { #{{{ @@ -17,30 +16,39 @@ sub preprocess (@) { #{{{ # 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 %linkedto; - foreach my $p (keys %IkiWiki::links) { - map { $linkedto{IkiWiki::bestlink($p, $_)}=1 if length $_ } - @{$IkiWiki::links{$p}}; + foreach my $p (keys %links) { + map { $linkedto{bestlink($p, $_)}=1 if length $_ } + @{$links{$p}}; } my @orphans; - foreach my $page (keys %IkiWiki::renderedfiles) { + my $discussion=gettext("discussion"); + foreach my $page (keys %pagesources) { next if $linkedto{$page}; - next unless IkiWiki::pagespec_match($page, $params{pages}); + next unless pagespec_match($page, $params{pages}, location => $params{page}); # If the page has a link to some other page, it's # indirectly linked to a page via that page's backlinks. next if grep { length $_ && - ($_ !~ /\/Discussion$/i || ! $IkiWiki::config{discussion}) && - IkiWiki::bestlink($page, $_) !~ /^($page|)$/ - } @{$IkiWiki::links{$page}}; + ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) && + bestlink($page, $_) !~ /^($page|)$/ + } @{$links{$page}}; push @orphans, $page; } - return "All pages are linked to by other pages." unless @orphans; - return "