Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 6072395002ec2da8e0be02303e82b17fc9623d4e..e3cc3c940882dd27ec7576f8ff8ee63eb8dd845e 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -16,6 +16,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
+                       section => "widget",
                },
 }
 
@@ -28,27 +29,27 @@ sub preprocess (@) {
        # considering as orphans.
        add_depends($params{page}, "*", deptype("links"));
        
-       my @orphans=use_pagespec($params{page}, $params{pages},
+       my @orphans=pagespec_match_list($params{page}, $params{pages},
                # update when orphans are added/removed
                deptype => deptype("presence"),
-               limit => sub {
+               filter => sub {
                        my $page=shift;
 
                        # Filter out pages that other pages link to.
-                       return 0 if IkiWiki::backlink_pages($page);
+                       return 1 if IkiWiki::backlink_pages($page);
 
                        # Toplevel index is assumed to never be orphaned.
-                       return 0 if $page eq 'index';
+                       return 1 if $page eq 'index';
 
                        # If the page has a link to some other page, it's
                        # indirectly linked via that page's backlinks.
-                       return 0 if grep {
+                       return 1 if grep {
                                length $_ &&
                                ($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
                                bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
                        } @{$links{$page}};
                        
-                       return 1;
+                       return 0;
                },
        );