X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/182c3b0db3aebda8dfb134f4b55a25e3bba9f144..70ce716007e2fdeabc3350a10ec08ff34c0246be:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e97f46775..58556148f 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -97,11 +97,6 @@ sub preprocess ($$$) { #{{{
 		if (length $escape) {
 			return "[[$command $params]]";
 		}
-		elsif ($preprocessing{$page}) {
-			# Avoid loops of preprocessed pages preprocessing
-			# other pages that preprocess them, etc.
-			return "[[$command would cause preprocessing loop]]";
-		}
 		elsif (exists $hooks{preprocess}{$command}) {
 			# Note: preserve order of params, some plugins may
 			# consider it significant.
@@ -129,17 +124,21 @@ sub preprocess ($$$) { #{{{
 					push @params, $val, '';
 				}
 			}
-			$preprocessing{$page}=1;
+			if ($preprocessing{$page}++ > 10) {
+				# Avoid loops of preprocessed pages preprocessing
+				# other pages that preprocess them, etc.
+				return "[[$command preprocessing loop detected on $page at depth $preprocessing{$page}]]";
+			}
 			my $ret=$hooks{preprocess}{$command}{call}->(
 				@params,
 				page => $page,
 				destpage => $destpage,
 			);
-			delete $preprocessing{$page};
+			$preprocessing{$page}--;
 			return $ret;
 		}
 		else {
-			return "[[$command not processed]]";
+			return "[[$command $params]]";
 		}
 	};