Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index cf95026c871570358a00d9bc1027c9dc291d66ad..c512b3b9793af3f489762ac8f4327daeb8361919 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -41,7 +41,7 @@ sub check_canremove ($$$) { #{{{
                error(sprintf(gettext("%s is not a file"), $file));
        }
        
                error(sprintf(gettext("%s is not a file"), $file));
        }
        

-       # Must be editiable.
+       # Must be editable.

        IkiWiki::check_canedit($page, $q, $session);
 
        # If a user can't upload an attachment, don't let them delete it.
        IkiWiki::check_canedit($page, $q, $session);
 
        # If a user can't upload an attachment, don't let them delete it.


@@ -98,7 +98,9 @@ sub removal_confirm ($$@) { #{{{
        my $attachment=shift;
        my @pages=@_;
 
        my $attachment=shift;
        my @pages=@_;
 

-       check_canremove($_, $q, $session) foreach @pages;
+       foreach my $page (@pages) {
+               check_canremove($page, $q, $session);
+       }

 
        # Save current form state to allow returning to it later
        # without losing any edits.
 
        # Save current form state to allow returning to it later
        # without losing any edits.