don't duplicate code from editpage, just pull the values it sets out of the

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ab94f86225cef55c21617fa9e818b8a8aa3ee1d2..0029fd2e817057e47bc675648127f97283e23c26 100644 (file)
--- 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 { #{{{