Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index cf74c9b794bb4977d0ed8eb17fbc6e36ed045ba0..d981670e78d22d5f85a86429cdcda9bc60f78d44 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -23,33 +23,26 @@ sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        

-       # Needs to update whenever a page is added or removed, so
-       # register a dependency.
+       # Needs to update whenever a page is changed, added, or removed,
+       # in order to see the link changes.

        add_depends($params{page}, $params{pages});
        
        add_depends($params{page}, $params{pages});
        

-       my %linkedto;
-       foreach my $p (keys %links) {
-               map { $linkedto{bestlink($p, $_)}=1 if length $_ }
-                       @{$links{$p}};
-       }
-       

        my @orphans;
        my @orphans;

-       my $discussion=gettext("discussion");

        foreach my $page (pagespec_match_list(
        foreach my $page (pagespec_match_list(

-                       [ grep { ! $linkedto{$_} && $_ ne 'index' }
+                       [ grep { ! IkiWiki::backlink_pages($_) && $_ ne 'index' }

                                keys %pagesources ],
                        $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 $_ &&
                                keys %pagesources ],
                        $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}) &&
+                       ($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&

                        bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
                } @{$links{$page}};
                push @orphans, $page;
        }
        
                        bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
                } @{$links{$page}};
                push @orphans, $page;
        }
        

-       return gettext("All pages are linked to by other pages.") unless @orphans;
+       return gettext("All pages have other pages linking to them.") unless @orphans;

        return "<ul>\n".
                join("\n",
                        map {
        return "<ul>\n".
                join("\n",
                        map {