urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to > n (currently 10) cycle loop protection since eg tumov's include 

plugin preprocesses included pages using the name of the including page
master
joey 2006-08-26 21:26:54 +00:00
parent 92885b87ab
commit 609f48c93c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IkiWiki/Render.pm
View File

@ -97,10 +97,10 @@ sub preprocess ($$$) { #{{{
if (length $escape) {
return "[[$command $params]]";
}
elsif ($preprocessing{$page}) {
elsif ($preprocessing{$page}++ > 10) {
# Avoid loops of preprocessed pages preprocessing
# other pages that preprocess them, etc.
return "[[$command would cause preprocessing loop]]";
return "[[$command preprocessing loop detected]]";
}
elsif (exists $hooks{preprocess}{$command}) {
# Note: preserve order of params, some plugins may
@ -129,13 +129,12 @@ sub preprocess ($$$) { #{{{
push @params, $val, '';
}
}
$preprocessing{$page}=1;
my $ret=$hooks{preprocess}{$command}{call}->(
@params,
page => $page,
destpage => $destpage,
);
delete $preprocessing{$page};
$preprocessing{$page}--;
return $ret;
}
else {