bugfixes

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 14f6f9d5f8bf54682d43e79dd3cb632338a993cf..09c9121f36d41aa3924d7f2bb86a0b51b21a2762 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -681,18 +681,18 @@ sub gen_autofile ($$$) {
        my $autofile=shift;
        my $pages=shift;
        my $del=shift;
        my $autofile=shift;
        my $pages=shift;
        my $del=shift;

-       
+

        if (srcfile($autofile, 1) || file_pruned($autofile)) {
                return;
        }
        
        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) ||
        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;
        }
        
                return;
        }
        


@@ -701,8 +701,8 @@ sub gen_autofile ($$$) {
                return;
        }
 
                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;
        }
 
                return;
        }