diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-12-14 17:16:40 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-12-14 17:16:40 -0500 |
| commit | bb1ce7207d9707848dfa7ebf6e32bfff5736732c (patch) | |
| tree | 7c423a74bf8d9f260b2570af9987a55a843116b4 | |
| parent | b4bc7d17080055c615bc264c4d5b7d791161682c (diff) | |
attachment: Fix several utf-8 problems.
Similar to those in the rename plugin, although here we can't use
the form object.
| -rw-r--r-- | IkiWiki/Plugin/attachment.pm | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 087c315a9..953e71625 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -112,7 +112,7 @@ sub formbuilder (@) { return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ; - my $filename=$q->param('attachment'); + my $filename=Encode::decode_utf8($q->param('attachment')); if (defined $filename && length $filename && ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) { my $session=$params{session}; @@ -189,9 +189,10 @@ sub formbuilder (@) { IkiWiki::saveindex(); } elsif ($form->submitted eq "Insert Links") { - my $page=quotemeta($q->param("page")); + my $page=quotemeta(Encode::decode_utf8($q->param("page"))); my $add=""; foreach my $f ($q->param("attachment_select")) { + $f=Encode::decode_utf8($f); $f=~s/^$page\///; $add.="[[$f]]\n"; } diff --git a/debian/changelog b/debian/changelog index 41f4ec870..c286065fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * monotone: Deal with format change in version 0.45. (Thanks, Richard Levitte) * rename: Fix some utf-8 problems. + * attachment: Fix several utf-8 problems. -- Joey Hess <joeyh@debian.org> Wed, 02 Dec 2009 17:22:21 -0500 |