Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 65d5e3e9ba503327bbd8e1404a7080b2c85aa1b4..32cbc5dd5508d3df58945ebef75a80704034c7ad 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,12 +4,21 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

+       hook(type => "getsetup", id => "orphans", call => \&getsetup);

        hook(type => "preprocess", id => "orphans", call => \&preprocess);
 } # }}}
 
        hook(type => "preprocess", id => "orphans", call => \&preprocess);
 } # }}}
 

+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};


@@ -27,14 +36,14 @@ sub preprocess (@) { #{{{
        my @orphans;
        my $discussion=gettext("discussion");
        foreach my $page (keys %pagesources) {
        my @orphans;
        my $discussion=gettext("discussion");
        foreach my $page (keys %pagesources) {

-               next if $linkedto{$page};
-               next unless pagespec_match($page, $params{pages}, $params{page});
+               next if $linkedto{$page} || $page eq 'index';
+               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 $_ &&
                        ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
                # 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 $_ &&
                        ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&

-                       bestlink($page, $_) !~ /^($page|)$/ 
+                       bestlink($page, $_) !~ /^(\Q$page\E|)$/ 

                } @{$links{$page}};
                push @orphans, $page;
        }
                } @{$links{$page}};
                push @orphans, $page;
        }