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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e97f46775..ca6e9666b 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -20,19 +20,26 @@ sub linkify ($$$) { #{{{
 	return $content;
 } #}}}
 
-sub htmlize ($$) { #{{{
+sub htmlize ($$$) { #{{{
+	my $page=shift;
 	my $type=shift;
 	my $content=shift;
 	
 	if (exists $hooks{htmlize}{$type}) {
-		$content=$hooks{htmlize}{$type}{call}->($content);
+		$content=$hooks{htmlize}{$type}{call}->(
+			page => $page,
+			content => $content,
+		);
 	}
 	else {
 		error("htmlization of $type not supported");
 	}
 
 	run_hooks(sanitize => sub {
-		$content=shift->($content);
+		$content=shift->(
+			page => $page,
+			content => $content,
+		);
 	});
 	
 	return $content;
@@ -97,11 +104,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 +131,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]]";
 		}
 	};
 	
@@ -210,7 +216,10 @@ sub genpage ($$$) { #{{{
 	$content=$template->output;
 
 	run_hooks(format => sub {
-		$content=shift->($content);
+		$content=shift->(
+			page => $page,
+			content => $content,
+		);
 	});
 
 	return $content;
@@ -288,7 +297,7 @@ sub render ($) { #{{{
 		
 		$content=preprocess($page, $page, $content);
 		$content=linkify($page, $page, $content);
-		$content=htmlize($type, $content);
+		$content=htmlize($page, $type, $content);
 		
 		check_overwrite("$config{destdir}/".htmlpage($page), $page);
 		writefile(htmlpage($page), $config{destdir},