X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cbf1c8b810cf782e36bbe87343d5f4a81f5dd52e..73af360e994306c1d0b14a69a4aa04750e61f0ef:/IkiWiki/Plugin/remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index f263db9b8..a886956b2 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -12,7 +12,7 @@ sub import { #{{{
 
 } # }}}
 
-sub check_canremove ($$$$) {
+sub check_canremove ($$$$) { #{{{
 	my $page=shift;
 	my $q=shift;
 	my $session=shift;
@@ -42,7 +42,7 @@ sub check_canremove ($$$$) {
 	if ($attachment) {
 		IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
 	}
-}
+} #}}}
 
 sub formbuilder_setup (@) { #{{{
 	my %params=@_;
@@ -79,7 +79,7 @@ sub confirmation_form ($$) { #{{{
 	return $f, ["Remove", "Cancel"];
 } #}}}
 
-sub removal_confirm ($$@) {
+sub removal_confirm ($$@) { #{{{
 	my $q=shift;
 	my $session=shift;
 	my $attachment=shift;
@@ -107,9 +107,9 @@ sub removal_confirm ($$@) {
 
 	IkiWiki::showform($f, $buttons, $session, $q);
 	exit 0;
-}
+} #}}}
 
-sub postremove ($) {
+sub postremove ($) { #{{{
 	my $session=shift;
 
 	# Load saved form state and return to edit form.
@@ -117,7 +117,7 @@ sub postremove ($) {
 	$session->clear("postremove");
 	IkiWiki::cgi_savesession($session);
 	IkiWiki::cgi($postremove, $session);
-}
+} #}}}
 
 sub formbuilder (@) { #{{{
 	my %params=@_;
@@ -171,11 +171,10 @@ sub sessioncgi ($$) { #{{{
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
 				foreach my $file (@files) {
-					my $token=IkiWiki::rcs_prepedit($file);
 					IkiWiki::rcs_remove($file);
-					IkiWiki::rcs_commit($file, gettext("removed"),
-						$token, $session->param("name"), $ENV{REMOTE_ADDR});
 				}
+				IkiWiki::rcs_commit_staged(gettext("removed"),
+					$session->param("name"), $ENV{REMOTE_ADDR});
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}