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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index bd3c6b8b9..2219634ca 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -7,7 +7,8 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-	IkiWiki::register_plugin("preprocess", "orphans", \&preprocess);
+	IkiWiki::hook(type => "preprocess", id => "orphans",
+		call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -27,15 +28,19 @@ sub preprocess (@) { #{{{
 	my @orphans;
 	foreach my $page (keys %IkiWiki::renderedfiles) {
 		next if $linkedto{$page};
-		next unless IkiWiki::globlist_match($page, $params{pages});
+		next unless IkiWiki::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 || ! $IkiWiki::config{discussion}) &&
+			IkiWiki::bestlink($page, $_) !~ /^($page|)$/ 
+		} @{$IkiWiki::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>".IkiWiki::htmllink($params{page}, $params{destpage}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
 } # }}}
 
 1