X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..d36361b01015da0338d3c0dc20625b5121ed94b2:/IkiWiki/Plugin/orphans.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 6ba37615e..0f96b9397 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "preprocess", id => "orphans", call => \&preprocess);
@@ -25,21 +25,30 @@ sub preprocess (@) { #{{{
 	}
 	
 	my @orphans;
-	foreach my $page (keys %renderedfiles) {
-		next if $linkedto{$page};
-		next unless pagespec_match($page, $params{pages});
+	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});
 		# 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 || ! $config{discussion}) &&
+			($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
 			bestlink($page, $_) !~ /^($page|)$/ 
 		} @{$links{$page}};
 		push @orphans, $page;
 	}
 	
 	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";
+	return "<ul>\n".
+		join("\n",
+			map {
+				"<li>".
+				htmllink($params{page}, $params{destpage}, $_,
+					 noimageinline => 1).
+				"</li>"
+			} sort @orphans).
+		"</ul>\n";
 } # }}}
 
 1