X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3ad4d93e33284ad6d51d2fa5f9abf1943b894d48..f7f3b0bb7d91c74f67023e970cee71ad2ea260da:/IkiWiki/Render.pm diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 58556148f..2c1ea3eb7 100644 --- 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; @@ -124,7 +131,7 @@ sub preprocess ($$$) { #{{{ push @params, $val, ''; } } - if ($preprocessing{$page}++ > 10) { + 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}]]"; @@ -209,7 +216,10 @@ sub genpage ($$$) { #{{{ $content=$template->output; run_hooks(format => sub { - $content=shift->($content); + $content=shift->( + page => $page, + content => $content, + ); }); return $content; @@ -287,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},