X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/99292550fdf3c5bf9feb4a665e2de99f5cfc0d35..bd4cd357a13ae205294217024dbb74e1d74534fd:/IkiWiki/Plugin/orphans.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 06b51bddc..2219634ca 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -4,9 +4,11 @@ package IkiWiki::Plugin::orphans; use warnings; use strict; +use IkiWiki; sub import { #{{{ - IkiWiki::register_plugin("preprocess", "orphans", \&preprocess); + IkiWiki::hook(type => "preprocess", id => "orphans", + call => \&preprocess); } # }}} sub preprocess (@) { #{{{ @@ -26,15 +28,19 @@ sub preprocess (@) { #{{{ my @orphans; foreach my $page (keys %IkiWiki::renderedfiles) { next if $linkedto{$page}; - next unless IkiWiki::globlist_match($page, $params{pages}); + next unless IkiWiki::pagespec_match($page, $params{pages}); # 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::bestlink($page, $_) ne $page } @{$IkiWiki::links{$page}}; + next if grep { + length $_ && + ($_ !~ /\/Discussion$/i || ! $IkiWiki::config{discussion}) && + IkiWiki::bestlink($page, $_) !~ /^($page|)$/ + } @{$IkiWiki::links{$page}}; push @orphans, $page; } return "All pages are linked to by other pages." unless @orphans; - return "\n"; + return "\n"; } # }}} 1