* Add toc (table of contents) plugin.

[ikiwiki.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8e998e8b2fdfd248ef118fdcf3b3cf0e8262891b..58556148f21fa216f04aaa3a827794384e6db2d7 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -84,7 +84,7 @@ sub parentlinks ($) { #{{{
        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)
@@ -97,11 +97,6 @@ sub preprocess ($$$) { #{{{
                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.
@@ -129,17 +124,21 @@ sub preprocess ($$$) { #{{{
                                        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]]";
                }
        };