X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a71b92ed5c5572a1384367f8a90e1fc489b3c660..b28323e76a98d56fa4af813338a134dea0106626:/IkiWiki/Render.pm?ds=sidebyside

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index b3afabf32..49d080c16 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -517,7 +517,7 @@ sub link_types_changed ($$) {
 	my $old = shift;
 
 	return 0 if !defined $new && !defined $old;
-	return 1 if !defined $new || !defined $old;
+	return 1 if (!defined $new && %$old) || (!defined $old && %$new);
 
 	while (my ($type, $links) = each %$new) {
 		foreach my $link (keys %$links) {
@@ -682,20 +682,29 @@ sub gen_autofile ($$$) {
 	my $pages=shift;
 	my $del=shift;
 
-	if (srcfile($autofile, 1) || file_pruned($autofile)) {
+	if (file_pruned($autofile)) {
 		return;
 	}
-	
+
 	my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
-	if (! defined $file || -l $file || -d _ || -e _) {
+	if (! defined $file) {
+		return;
+	}
+
+	# Remember autofiles that were tried, and never try them again later.
+	if (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}) {
 		return;
 	}
+	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
 
-	if ((!defined $file) ||
-	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile})) {
+	if (srcfile($autofile, 1) || file_pruned($autofile)) {
 		return;
 	}
 	
+	if (-l $file || -d _ || -e _) {
+		return;
+	}
+
 	my $page = pagename($file);
 	if ($pages->{$page}) {
 		return;
@@ -706,7 +715,6 @@ sub gen_autofile ($$$) {
 	}
 
 	$autofiles{$autofile}{generator}->();
-	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
 	$pages->{$page}=1;
 	return 1;
 }