(no commit message)

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d114c9a69d760194e05c788e36a74d4c8ab3c144..66ae868095ad792360e6459753e9d5f32f15e9c2 100644 (file)
--- 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;