* Rebuilding on upgrade to this version is recommended.

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index bd3c6b8b9f8e4157856417847458832fbe731d26..a7aa89f58f719327586132a0131030dd1afa826e 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -7,7 +7,8 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-       IkiWiki::register_plugin("preprocess", "orphans", \&preprocess);
+       IkiWiki::hook(type => "preprocess", id => "orphans",
+               call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -30,7 +31,7 @@ sub preprocess (@) { #{{{
                next unless IkiWiki::globlist_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, $_) ne $page } @{$IkiWiki::links{$page}};
                push @orphans, $page;
        }