X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/678d467a4080dd549f2b6f276f963eac384e1b4f..7227c2debfeef94b35f7d81f42900aa01820caa3:/IkiWiki/Plugin/orphans.pm

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 605e6e43a..711226772 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -27,28 +27,22 @@ sub preprocess (@) {
 	# register a dependency.
 	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 $discussion=gettext("discussion");
-	foreach my $page (keys %pagesources) {
-		next if $linkedto{$page} || $page eq 'index';
-		next unless pagespec_match($page, $params{pages}, location => $params{page});
+	foreach my $page (pagespec_match_list(
+			[ 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 $_ &&
-			($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
+			($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
 			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 {