From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:54:18 +0000 (-0400)
Subject: bugfixes
X-Git-Tag: 3.20100427~62^2~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a0e3787a056b160843eca263c82d591c7161988;p=ikiwiki.git

bugfixes
---

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 14f6f9d5f..09c9121f3 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -681,18 +681,18 @@ sub gen_autofile ($$$) {
 	my $autofile=shift;
 	my $pages=shift;
 	my $del=shift;
-	
+
 	if (srcfile($autofile, 1) || file_pruned($autofile)) {
 		return;
 	}
 	
-	my $file="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+	my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
 	if (! defined $file || -l $file || -d _ || -e _) {
 		return;
 	}
 
 	if ((!defined $file) ||
-	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+	    (exists $wikistate{$autofiles{$autofile}{plugin}}{deleted_autofile}{$autofile})) {
 		return;
 	}
 	
@@ -701,8 +701,8 @@ sub gen_autofile ($$$) {
 		return;
 	}
 
-	if (grep { $_ eq $file } @$del) {
-		$wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted}=1;
+	if (grep { $_ eq $autofile } @$del) {
+		$wikistate{$autofiles{$autofile}{plugin}}{deleted_autofile}{$autofile}=1;
 		return;
 	}