* Fix img plugin's handling of adding dependencies for images that do not

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 945892d177d7723bbd0ac579bcd0da36a40fd147..3a8a7954fe1dd6e5c49b5ba12a7f5ec6557e6fa6 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -7,8 +7,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "orphans",
-               call => \&preprocess);
+       hook(type => "preprocess", id => "orphans", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -17,26 +16,30 @@ sub preprocess (@) { #{{{
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.
-       IkiWiki::add_depends($params{page}, $params{pages});
+       add_depends($params{page}, $params{pages});
        
        my %linkedto;
-       foreach my $p (keys %IkiWiki::links) {
-               map { $linkedto{IkiWiki::bestlink($p, $_)}=1 if length $_ }
-                       @{$IkiWiki::links{$p}};
+       foreach my $p (keys %links) {
+               map { $linkedto{bestlink($p, $_)}=1 if length $_ }
+                       @{$links{$p}};
        }
        
        my @orphans;
-       foreach my $page (keys %IkiWiki::renderedfiles) {
+       foreach my $page (keys %renderedfiles) {
                next if $linkedto{$page};
-               next unless IkiWiki::globlist_match($page, $params{pages});
+               next unless 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 || ! $config{discussion}) &&
+                       bestlink($page, $_) !~ /^($page|)$/ 
+               } @{$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>".htmllink($params{page}, $params{destpage}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
 } # }}}
 
 1