X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8030ecac02a743e930e480650e8c14413f26d9a2..acecbad0ff4a8c441da520522710dd5357ab31e0:/IkiWiki.pm diff --git a/IkiWiki.pm b/IkiWiki.pm index d114c9a69..e2b2ceda3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1455,12 +1455,11 @@ sub filter ($$$) { return $content; } -sub check_canedit ($$$;$$) { +sub check_canedit ($$$;$) { my $page=shift; my $q=shift; my $session=shift; my $nonfatal=shift; - my $nosubs=shift; my $canedit; run_hooks(canedit => sub { @@ -1471,7 +1470,6 @@ sub check_canedit ($$$;$$) { $canedit=1; } elsif (ref $ret eq 'CODE') { - error(sprintf(gettext("you are not allowed to change %s"), $page)) if $nosubs && ! $nonfatal; $ret->() unless $nonfatal; $canedit=0; } @@ -1771,12 +1769,14 @@ sub template_depends ($$;@) { my $page=shift; my ($filename, $tpage, $untrusted)=template_file($name); + if (! defined $filename) { + error(sprintf(gettext("template %s not found"), $name)) + } + if (defined $page && defined $tpage) { add_depends($page, $tpage); } - - return unless defined $filename; - + my @opts=( filter => sub { my $text_ref = shift; @@ -1941,6 +1941,18 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } +sub rcs_preprevert ($) { + $hooks{rcs}{rcs_preprevert}{call}->(@_); +} + +sub rcs_revert (@) { + $hooks{rcs}{rcs_revert}{call}->(@_); +} + +sub rcs_showpatch ($) { + $hooks{rcs}{rcs_showpatch}{call}->(@_); +} + sub add_depends ($$;$) { my $page=shift; my $pagespec=shift;