urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2009-12-14 17:26:48 -05:00
parent cdbdf19c36
commit 4ee754536d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/remove.pm
View File

@ -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;

1
debian/changelog vendored
View File

@ -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