* Various CSS and formatting changes.

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 06b51bddcc6a13982b9a82f081361253059e858c..2219634caa3a4c28d2a07276712847be48f8363b 100644 (file)
--- 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 "<ul>\n".join("\n", map { "<li>".IkiWiki::htmllink($params{page}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
+       return "<ul>\n".join("\n", map { "<li>".IkiWiki::htmllink($params{page}, $params{destpage}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
 } # }}}
 
 1