X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/46c33b38324e9e71a9126f1aabd5e73e3358b22b..8ded30c748b9fe0ada324c89e449f72530e40ed3:/IkiWiki/Render.pm diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index f38669728..e97f46775 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -84,6 +84,7 @@ sub parentlinks ($) { #{{{ return @ret; } #}}} +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) @@ -96,6 +97,11 @@ 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. @@ -123,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]]";