X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d4ca3b3f50027d0dfd052f77ddcc4290ab0e6a81..6e273d60a604ffa44547f9672ef54ea5c4269a91:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cef770c67..2c1ea3eb7 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;
@@ -84,11 +91,11 @@ sub parentlinks ($) { #{{{
 	return @ret;
 } #}}}
 
-sub preprocess ($$$;$) { #{{{
+my %preprocessing;
+sub preprocess ($$$) { #{{{
 	my $page=shift; # the page the data comes from
 	my $destpage=shift; # the page the data will appear in (different for inline)
 	my $content=shift;
-	my $onlystrip=shift || 0; # strip directives without processing
 
 	my $handle=sub {
 		my $escape=shift;
@@ -97,9 +104,6 @@ sub preprocess ($$$;$) { #{{{
 		if (length $escape) {
 			return "[[$command $params]]";
 		}
-		elsif ($onlystrip) {
-			return "";
-		}
 		elsif (exists $hooks{preprocess}{$command}) {
 			# Note: preserve order of params, some plugins may
 			# consider it significant.
@@ -127,14 +131,21 @@ sub preprocess ($$$;$) { #{{{
 					push @params, $val, '';
 				}
 			}
-			return $hooks{preprocess}{$command}{call}->(
+			if ($preprocessing{$page}++ > 3) {
+				# 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,
 			);
+			$preprocessing{$page}--;
+			return $ret;
 		}
 		else {
-			return "[[$command not processed]]";
+			return "[[$command $params]]";
 		}
 	};
 	
@@ -205,7 +216,10 @@ sub genpage ($$$) { #{{{
 	$content=$template->output;
 
 	run_hooks(format => sub {
-		$content=shift->($content);
+		$content=shift->(
+			page => $page,
+			content => $content,
+		);
 	});
 
 	return $content;
@@ -283,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},