From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 22:26:48 +0000 (-0500)
Subject: remove: Fix problem removing pages with utf-8 in the name.
X-Git-Tag: 3.20091218~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4ee754536d14610580f852d134a842c2cb9a1665

remove: Fix problem removing pages with utf-8 in the name.
---

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index cbc8a0f2c..2b8cf0414 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -166,7 +166,7 @@ sub formbuilder (@) {
 			removal_confirm($q, $session, 0, $form->field("page"));
 		}
 		elsif ($form->submitted eq "Remove Attachments") {
-			my @selected=$q->param("attachment_select");
+			my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select");
 			if (! @selected) {
 				error(gettext("Please select the attachments to remove."));
 			}
@@ -187,7 +187,7 @@ sub sessioncgi ($$) {
 			postremove($session);
 		}
 		elsif ($form->submitted eq 'Remove' && $form->validate) {
-			my @pages=$q->param("page");
+			my @pages=$form->field("page");
 	
 			# Validate removal by checking that the page exists,
 			# and that the user is allowed to edit(/remove) it.
@@ -237,7 +237,7 @@ sub sessioncgi ($$) {
 			}
 		}
 		else {
-			removal_confirm($q, $session, 0, $q->param("page"));
+			removal_confirm($q, $session, 0, $form->field("page"));
 		}
 
 		exit 0;
diff --git a/debian/changelog b/debian/changelog
index 258f07b08..d84477298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low
   * rename: Fix some utf-8 problems.
   * attachment: Fix several utf-8 problems.
   * attachment: Fix reversion in attachment sorting by age.
+  * remove: Fix problem removing pages with utf-8 in the name.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500