]> sipb.mit.edu Git - ikiwiki.git/commitdiff
add explicit check_canedit calls when checking canattach or canremove
authorJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 20:17:33 +0000 (16:17 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 20:17:33 +0000 (16:17 -0400)
IkiWiki/Receive.pm

index 14936f8cdca6bb7e9cdad935253be51d4f339b1f..2952480b485428649425f2a02dab7d1bc1b224a6 100644 (file)
@@ -100,7 +100,7 @@ sub test () {
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
-                                       next;
+                                       next if IkiWiki::check_canedit($file, $cgi, $session, 1);
                                }
                        }
                }
@@ -116,7 +116,7 @@ sub test () {
 
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                                IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
-                               next;
+                               next if IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 1);
                        }
                }
                else {