return @ret;
} #}}}
-my @preprocessing;
+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)
if (length $escape) {
return "[[$command $params]]";
}
- elsif (grep { $_ eq $page } @preprocessing) {
- # 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.
push @params, $val, '';
}
}
- push @preprocessing, $page;
+ 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,
);
- pop @preprocessing;
+ $preprocessing{$page}--;
return $ret;
}
else {
- return "[[$command not processed]]";
+ return "[[$command $params]]";
}
};