size limits

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8e998e8b2fdfd248ef118fdcf3b3cf0e8262891b..2c1ea3eb7c0b73f507fb51c70499f01c10c51ccc 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -20,19 +20,26 @@ sub linkify ($$$) { #{{{
        return $content;
 } #}}}
 
-sub htmlize ($$) { #{{{
+sub htmlize ($$$) { #{{{
+       my $page=shift;
        my $type=shift;
        my $content=shift;
        
        if (exists $hooks{htmlize}{$type}) {
-               $content=$hooks{htmlize}{$type}{call}->($content);
+               $content=$hooks{htmlize}{$type}{call}->(
+                       page => $page,
+                       content => $content,
+               );
        }
        else {
                error("htmlization of $type not supported");
        }
 
        run_hooks(sanitize => sub {
-               $content=shift->($content);
+               $content=shift->(
+                       page => $page,
+                       content => $content,
+               );
        });
        
        return $content;
@@ -84,7 +91,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 +104,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 +131,21 @@ sub preprocess ($$$) { #{{{
                                        push @params, $val, '';
                                }
                        }
-                       push @preprocessing, $page;
+                       if ($preprocessing{$page}++ > 3) {
+                               # 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]]";
                }
        };
        
@@ -210,7 +216,10 @@ sub genpage ($$$) { #{{{
        $content=$template->output;
 
        run_hooks(format => sub {
-               $content=shift->($content);
+               $content=shift->(
+                       page => $page,
+                       content => $content,
+               );
        });
 
        return $content;
@@ -288,7 +297,7 @@ sub render ($) { #{{{
                
                $content=preprocess($page, $page, $content);
                $content=linkify($page, $page, $content);
-               $content=htmlize($type, $content);
+               $content=htmlize($page, $type, $content);
                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                writefile(htmlpage($page), $config{destdir},