X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3b0fce93e40e5457b63ceda9692901539eb4fc82..89484c06d97cc7d47118ba9bcf6039431d3ff368:/IkiWiki/Plugin/orphans.pm

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index bd3c6b8b9..39d836a01 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -7,7 +7,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-	IkiWiki::register_plugin("preprocess", "orphans", \&preprocess);
+	hook(type => "preprocess", id => "orphans", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -16,26 +16,31 @@ 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) {
+	my $discussion=gettext("discussion");
+	foreach my $page (keys %renderedfiles) {
 		next if $linkedto{$page};
-		next unless IkiWiki::globlist_match($page, $params{pages});
+		next unless pagespec_match($page, $params{pages}, $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 $_ && $_ !~/\/Discussion$/i && IkiWiki::bestlink($page, $_) ne $page } @{$IkiWiki::links{$page}};
+		next if grep { 
+			length $_ &&
+			($_ !~ /\/\Q$discussion\E$/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 gettext("All pages are linked to by other pages.") unless @orphans;
+	return "<ul>\n".join("\n", map { "<li>".htmllink($params{page}, $params{destpage}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
 } # }}}
 
 1