diff options
author | Joey Hess <joey@kitenet.net> | 2010-05-07 12:42:38 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-05-07 12:42:38 -0400 |
commit | 3adb47ec4f7374128d18a88cff54269104fc21fe (patch) | |
tree | dd1ac2c19cece5de41a9b557d76b14ce40687a23 /IkiWiki/Render.pm | |
parent | d9d910f6765de6ba07508ab56a5a0f93edb4c8ad (diff) | |
parent | 25033d91145d0f102c6f6889f04e80e31b218684 (diff) | |
download | ikiwiki-3adb47ec4f7374128d18a88cff54269104fc21fe.tar ikiwiki-3adb47ec4f7374128d18a88cff54269104fc21fe.tar.gz |
Merge branch 'master' into commentreorg
Conflicts:
debian/changelog
Diffstat (limited to 'IkiWiki/Render.pm')
-rw-r--r-- | IkiWiki/Render.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index e5ba0079b..c9ba95363 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -62,8 +62,8 @@ sub genpage ($$) { my $page=shift; my $content=shift; - run_hooks(postscan => sub { - shift->(page => $page, content => $content); + run_hooks(indexhtml => sub { + shift->(page => $page, destpage => $page, content => $content); }); my $templatefile; @@ -800,8 +800,8 @@ sub refresh () { render_backlinks($backlinkchanged); remove_unrendered(); - if (@$del) { - run_hooks(delete => sub { shift->(@$del) }); + if (@$del || @$internal_del) { + run_hooks(delete => sub { shift->(@$del, @$internal_del) }); } if (%rendered) { run_hooks(change => sub { shift->(keys %rendered) }); |