X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/055179cb4cc9b8bc9b204e1a9f83b1f59e13824e..3922ba15ba04d5519e77eae3cdc760e5853687d4:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ab94f8622..0029fd2e8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -871,7 +871,7 @@ sub loadindex () { #{{{
 			$pagecase{lc $page}=$page;
 			foreach my $k (grep /_/, keys %items) {
 				my ($id, $key)=split(/_/, $k, 2);
-				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k};
+				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
 			}
 		}
 		$oldrenderedfiles{$page}=[@{$items{dest}}];
@@ -1067,10 +1067,10 @@ sub file_pruned ($$) { #{{{
 	require File::Spec;
 	my $file=File::Spec->canonpath(shift);
 	my $base=File::Spec->canonpath(shift);
-	$file =~ s#^\Q$base\E/*##;
+	$file =~ s#^\Q$base\E/+##;
 
 	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
-	return $file =~ m/$regexp/;
+	return $file =~ m/$regexp/ && $file ne $base;
 } #}}}
 
 sub gettext { #{{{