Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mention style.css changes
[git.ikiwiki.info.git]
/
IkiWiki
/
Render.pm
diff --git
a/IkiWiki/Render.pm
b/IkiWiki/Render.pm
index d0c7e58a3a00f0dccf46f00981a34af40b59d43c..c9ba95363a8a60b49b609a59a7617f79bb22c96f 100644
(file)
--- a/
IkiWiki/Render.pm
+++ b/
IkiWiki/Render.pm
@@
-62,8
+62,8
@@
sub genpage ($$) {
my $page=shift;
my $content=shift;
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;
});
my $templatefile;
@@
-112,7
+112,14
@@
sub genpage ($$) {
}
}
}
}
- if ($actions) {
+ my @actions;
+ run_hooks(pageactions => sub {
+ push @actions, map { { action => $_ } }
+ grep { defined } shift->(page => $page);
+ });
+ $template->param(actions => \@actions);
+
+ if ($actions || @actions) {
$template->param(have_actions => 1);
}
$template->param(have_actions => 1);
}
@@
-136,8
+143,9
@@
sub genpage ($$) {
backlinks => $backlinks,
more_backlinks => $more_backlinks,
mtime => displaytime($pagemtime{$page}),
backlinks => $backlinks,
more_backlinks => $more_backlinks,
mtime => displaytime($pagemtime{$page}),
- ctime => displaytime($pagectime{$page}),
+ ctime => displaytime($pagectime{$page}
, undef, 1
),
baseurl => baseurl($page),
baseurl => baseurl($page),
+ html5 => $config{html5},
);
run_hooks(pagetemplate => sub {
);
run_hooks(pagetemplate => sub {
@@
-313,6
+321,7
@@
sub find_src_files () {
my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
if (! defined $f) {
warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
if (! defined $f) {
warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+ return;
}
if ($underlay) {
}
if ($underlay) {
@@
-409,7
+418,7
@@
sub find_del_files ($) {
my @del;
my @internal_del;
my @del;
my @internal_del;
- foreach my $page (keys %page
mtime
) {
+ foreach my $page (keys %page
sources
) {
if (! $pages->{$page}) {
if (isinternal($page)) {
push @internal_del, $pagesources{$page};
if (! $pages->{$page}) {
if (isinternal($page)) {
push @internal_del, $pagesources{$page};
@@
-593,7
+602,7
@@
sub render_dependent ($$$$$$$) {
my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
- if ($rendered{$p}) {
+ if ($rendered{$p}
|| grep { $_ eq $p } @$del
) {
foreach my $f (@$files) {
next if $rendered{$f};
render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
foreach my $f (@$files) {
next if $rendered{$f};
render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
@@
-791,8
+800,8
@@
sub refresh () {
render_backlinks($backlinkchanged);
remove_unrendered();
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) });
}
if (%rendered) {
run_hooks(change => sub { shift->(keys %rendered) });