X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d4ca3b3f50027d0dfd052f77ddcc4290ab0e6a81..8ded30c748b9fe0ada324c89e449f72530e40ed3:/IkiWiki/Render.pm?ds=inline

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cef770c67..e97f46775 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -84,11 +84,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,8 +97,10 @@ sub preprocess ($$$;$) { #{{{
 		if (length $escape) {
 			return "[[$command $params]]";
 		}
-		elsif ($onlystrip) {
-			return "";
+		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
@@ -127,11 +129,14 @@ sub preprocess ($$$;$) { #{{{
 					push @params, $val, '';
 				}
 			}
-			return $hooks{preprocess}{$command}{call}->(
+			$preprocessing{$page}=1;
+			my $ret=$hooks{preprocess}{$command}{call}->(
 				@params,
 				page => $page,
 				destpage => $destpage,
 			);
+			delete $preprocessing{$page};
+			return $ret;
 		}
 		else {
 			return "[[$command not processed]]";