X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e01badd3e7034dde6b1287b640cd7806b7aea59f..f2b3d1341447cbf29189ab490daae418fbe5d02d:/IkiWiki/Plugin/orphans.pm

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 944eba541..ae330b23b 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -23,33 +23,30 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
-	# Needs to update whenever a page is added or removed, so
-	# 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}};
-	}
+	# Needs to update whenever a link changes, on any page
+	# since any page could link to one of the pages we're
+	# considering as orphans.
+	add_depends($params{page}, "*", links => 1);
+	# Also needs to update whenever potential orphans are added or
+	# removed.
+	add_depends($params{page}, $params{pages}, presence => 1);
 	
 	my @orphans;
-	my $discussion=lc(gettext("Discussion"));
 	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 $_ &&
-			($_ !~ /\/\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 {