X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/569d31d875837b163d041d651316253e682c100e..4944fb6829cd6892ba24276486ad9f5b34ebee1b:/IkiWiki/Plugin/remove.pm?ds=inline

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index d4f1c7d66..4c73ed9e5 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -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.
@@ -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();
 			}