update

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e97f46775f47a1a72b45de339aa7ac46ab1c4e7d..ca6e9666bfb345c57c6da8e8757ea024eeee7018 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -20,19 +20,26 @@ sub linkify ($$$) { #{{{
        return $content;
 } #}}}
 
        return $content;
 } #}}}
 

-sub htmlize ($$) { #{{{
+sub htmlize ($$$) { #{{{
+       my $page=shift;

        my $type=shift;
        my $content=shift;
        
        if (exists $hooks{htmlize}{$type}) {
        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 {
        }
        else {
                error("htmlization of $type not supported");
        }
 
        run_hooks(sanitize => sub {

-               $content=shift->($content);
+               $content=shift->(
+                       page => $page,
+                       content => $content,
+               );

        });
        
        return $content;
        });
        
        return $content;


@@ -97,11 +104,6 @@ sub preprocess ($$$) { #{{{
                if (length $escape) {
                        return "[[$command $params]]";
                }
                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.
                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 @params, $val, '';
                                }
                        }

-                       $preprocessing{$page}=1;
+                       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,
                        );
                        my $ret=$hooks{preprocess}{$command}{call}->(
                                @params,
                                page => $page,
                                destpage => $destpage,
                        );

-                       delete $preprocessing{$page};
+                       $preprocessing{$page}--;

                        return $ret;
                }
                else {
                        return $ret;
                }
                else {

-                       return "[[$command not processed]]";
+                       return "[[$command $params]]";

                }
        };
        
                }
        };
        


@@ -210,7 +216,10 @@ sub genpage ($$$) { #{{{
        $content=$template->output;
 
        run_hooks(format => sub {
        $content=$template->output;
 
        run_hooks(format => sub {

-               $content=shift->($content);
+               $content=shift->(
+                       page => $page,
+                       content => $content,
+               );

        });
 
        return $content;
        });
 
        return $content;


@@ -288,7 +297,7 @@ sub render ($) { #{{{
                
                $content=preprocess($page, $page, $content);
                $content=linkify($page, $page, $content);
                
                $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},
                
                check_overwrite("$config{destdir}/".htmlpage($page), $page);
                writefile(htmlpage($page), $config{destdir},