diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
| commit | 1f7f5d5e0e21920c5f15290cd34594ad91077071 (patch) | |
| tree | a19302c57ed6ea46c4bf05a1ed8d840725643069 /IkiWiki/Plugin/remove.pm | |
| parent | 917f54a777d152ee5963acd81bf8a2800a0507b1 (diff) | |
| parent | 20e691fe20ead76d826ab77501c6e9cbc7b487e8 (diff) | |
Merge branch 'master' into darcs
Diffstat (limited to 'IkiWiki/Plugin/remove.pm')
| -rw-r--r-- | IkiWiki/Plugin/remove.pm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index c8d76368e..68bf9d1ee 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -61,9 +61,10 @@ sub formbuilder_setup (@) { #{{{ my $form=$params{form}; my $q=$params{cgi}; - if (defined $form->field("do") && $form->field("do") eq "edit") { + if (defined $form->field("do") && ($form->field("do") eq "edit" || + $form->field("do") eq "create")) { # Removal button for the page, and also for attachments. - push @{$params{buttons}}, "Remove"; + push @{$params{buttons}}, "Remove" if $form->field("do") eq "edit"; $form->tmpl_param("field-remove" => '<input name="_submit" type="submit" value="Remove Attachments" />'); } } #}}} @@ -97,7 +98,9 @@ sub removal_confirm ($$@) { #{{{ 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. @@ -135,11 +138,12 @@ sub formbuilder (@) { #{{{ my %params=@_; my $form=$params{form}; - if (defined $form->field("do") && $form->field("do") eq "edit") { + if (defined $form->field("do") && ($form->field("do") eq "edit" || + $form->field("do") eq "create")) { my $q=$params{cgi}; my $session=$params{session}; - if ($form->submitted eq "Remove") { + if ($form->submitted eq "Remove" && $form->field("do") eq "edit") { removal_confirm($q, $session, 0, $form->field("page")); } elsif ($form->submitted eq "Remove Attachments") { |