really fix calls to check_can*
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 17:29:30 +0000 (13:29 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 17:29:30 +0000 (13:29 -0400)
IkiWiki/Receive.pm

index 33f548a1473ba271d4a1ccaaaba44ce92eb292ed..c69911a7cfbe0130ef7acf8e5b035e7aeaa880ee 100644 (file)
@@ -58,15 +58,15 @@ sub test () { #{{{
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {
-                               if (IkiWiki->can("check_canedit") &&
-                                   IkiWiki::check_canedit($page, $cgi, $session)) {
-                                       next;
+                               if (IkiWiki->can("check_canedit")) {
+                                   IkiWiki::check_canedit($page, $cgi, $session);
+                                   next;
                                }
                        }
                        else {
-                               if (IkiWiki::Plugin::attachment->can("check_canattach") &&
-                                   IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path})) {
-                                       next;
+                               if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+                                       IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
+                                       next;
                                }
                        }
                }
@@ -80,15 +80,15 @@ sub test () { #{{{
                        # could add.)
                        next if $newfiles{$file};
 
-                       if (IkiWiki::Plugin::remove->can("check_canremove") &&
-                           IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session)) {
+                       if (IkiWiki::Plugin::remove->can("check_canremove")) {
+                               IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
                                next;
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
-                               
+               
                error sprintf(gettext("you are not allowed to change %s"), $file);
        }