X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/39195de96e6f705e4a5741254d6d01d14127005c..a648c439f3467571374daf597e9b3a659ea2008f:/IkiWiki/Plugin/orphans.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index b910758e0..944eba541 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,22 +4,22 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "orphans", call => \&getsetup);
 	hook(type => "preprocess", id => "orphans", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
@@ -34,16 +34,17 @@ sub preprocess (@) { #{{{
 	}
 	
 	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});
+	my $discussion=lc(gettext("Discussion"));
+	foreach my $page (pagespec_match_list(
+			[ grep { ! $linkedto{$_} && $_ 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}) &&
-			bestlink($page, $_) !~ /^($page|)$/ 
+			bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
 		} @{$links{$page}};
 		push @orphans, $page;
 	}
@@ -58,6 +59,6 @@ sub preprocess (@) { #{{{
 				"</li>"
 			} sort @orphans).
 		"</ul>\n";
-} # }}}
+}
 
 1