X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/569d31d875837b163d041d651316253e682c100e..618e3c107547d43a207ea2b7cad3a4e10e04cb04:/IkiWiki/Plugin/remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index d4f1c7d66..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;
@@ -21,7 +21,7 @@ sub check_canremove ($$$$) {
 	# Must be a known source file.
 	if (! exists $pagesources{$page}) {
 		error(sprintf(gettext("%s does not exist"),
-		htmllink("", "", $page, noimageinline => 1)));
+			htmllink("", "", $page, noimageinline => 1)));
 	}
 
 	# Must exist on disk, and be a regular file.
@@ -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=@_;
@@ -159,7 +159,10 @@ sub sessioncgi ($$) { #{{{
 			my @files;
 			foreach my $page (@pages) {
 				check_canremove($page, $q, $session, $q->param("attachment"));
-
+				
+				# This untaint is safe because of the
+				# checks performed above, which verify the
+				# page is a normal file, etc.
 				push @files, IkiWiki::possibly_foolish_untaint($pagesources{$page});
 			}
 
@@ -168,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();
 			}