From b1b5860b291645e212a9f9afd59d029fe0a035c6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 21 Jul 2008 14:03:39 -0400
Subject: [PATCH] touchups

---
 IkiWiki/Plugin/remove.pm | 8 ++++----
 debian/changelog         | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 5bc59225c..396bff2e4 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -47,7 +47,7 @@ sub confirmation_form ($$) { #{{{
 	$f->field(name => "page", label => "Will remove:", size => 60,
 		validate => sub {
 		# Validate page by checking that the page exists, and that
-		# the user is allowed to edit(/delete) it.
+		# the user is allowed to edit(/remove) it.
 		my $page=IkiWiki::titlepage(shift);
 		if (! exists $pagesources{$page}) {
 			$f->field(name => "page", message => gettext("page does not exist"));
@@ -97,13 +97,13 @@ sub sessioncgi ($$) { #{{{
         	my $session=shift;
 		my ($form, $buttons)=confirmation_form($q, $session);
 		IkiWiki::decode_form_utf8($form);
+
 		if ($form->submitted eq 'Cancel') {
 			# Load saved form state and return to edit form.
 			my $postremove=CGI->new($session->param("postremove"));
 			$session->clear("postremove");
 			IkiWiki::cgi_savesession($session);
 			IkiWiki::cgi($postremove, $session);
-			exit 0;
 		}
 		elsif ($form->submitted eq 'Remove' && $form->validate) {
 			my $page=IkiWiki::titlepage($form->field("page"));
@@ -130,12 +130,12 @@ sub sessioncgi ($$) { #{{{
 				$parent="index";
 			}
 			IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
-			exit 0;
 		}
 		else {
 			IkiWiki::showform($form, $buttons, $session, $q);
-			exit 0;
 		}
+
+		exit 0;
 	}
 }
 
diff --git a/debian/changelog b/debian/changelog
index 7fd149df5..bcfb411b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (2.55) UNRELEASED; urgency=low
     converted. (Simon McVittie)
   * editpage: Don't show attachments link when attachments are disabled.
   * All rcs backends need to implement rcs_remove. (Done for svn, git).
+  * remove: New plugin that adds the ability to remove pages via the web.
+    (Sponsored by The TOVA Company.)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
-- 
2.26.2