changelog/close bugs

diff --git a/debian/changelog b/debian/changelog
index 022fc7d05c47cdae3f64e71728a95500726cfd8a..59a9e6ba1a98f66a162e40e11e5ca2cf47f4dbe9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20140912) UNRELEASED; urgency=medium
+
+  * Don't double-decode CGI submissions with Encode.pm >= 2.53,
+    fixing "Error: Cannot decode string with wide characters".
+    Thanks, Antoine Beaupré
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 12 Sep 2014 21:23:58 +0100
+
 ikiwiki (3.20140831) unstable; urgency=medium
 
   * Make --no-gettime work in initial build. Closes: #755075

diff --git a/doc/bugs/garbled_non-ascii_characters_in_body_in_web_interface.mdwn b/doc/bugs/garbled_non-ascii_characters_in_body_in_web_interface.mdwn
index 74d8e461722294cdaa2203a9d87cf48603c4c636..657b86baa94a8ccbb8232f4b2404bcf0f759bf70 100644 (file)
--- a/doc/bugs/garbled_non-ascii_characters_in_body_in_web_interface.mdwn
+++ b/doc/bugs/garbled_non-ascii_characters_in_body_in_web_interface.mdwn
@@ -122,3 +122,5 @@ so this would explain the error on cancel, but doesn't explain the weird encodin
 
 > [[Looks good to me|users/smcv/ready]] although I'm not sure how valuable
 > the `$] < 5.02 || ` test is - I'd be tempted to just call `is_utf8`. --[[smcv]]
+
+>> [[merged|done]] --[[smcv]]

diff --git a/doc/forum/__34__Error:_cannot_decode_string_with_wide_characters__34___on_Mageia_Linux_x86-64_Cauldron.mdwn b/doc/forum/__34__Error:_cannot_decode_string_with_wide_characters__34___on_Mageia_Linux_x86-64_Cauldron.mdwn
index 8f922596822edd1183e814f1c7a35318079ebe80..c5a91be06c7403fdec2393478034e5d2fb48b0cd 100644 (file)
--- a/doc/forum/__34__Error:_cannot_decode_string_with_wide_characters__34___on_Mageia_Linux_x86-64_Cauldron.mdwn
+++ b/doc/forum/__34__Error:_cannot_decode_string_with_wide_characters__34___on_Mageia_Linux_x86-64_Cauldron.mdwn
@@ -18,3 +18,6 @@ Can anyone shed any light on this problem and guide me what I need to do to fix
 Regards,
 
 -- [Shlomi Fish](http://www.shlomifish.org/)
+
+> [[Merged anarcat's fix for
+this|bugs/garbled non-ascii characters in body in web interface]] --[[smcv]]

diff --git a/doc/todo/should_use_a_standard_encoding_for_utf_chars_in_filenames.mdwn b/doc/todo/should_use_a_standard_encoding_for_utf_chars_in_filenames.mdwn
index 2ca8620f1b555b9705cdac000e2deb866a08d7e0..5a55fcce5b8977612b3e3f360cf6a59dbc8179ba 100644 (file)
--- a/doc/todo/should_use_a_standard_encoding_for_utf_chars_in_filenames.mdwn
+++ b/doc/todo/should_use_a_standard_encoding_for_utf_chars_in_filenames.mdwn
@@ -92,5 +92,9 @@ I hope it's a bug, not a feature and you fix it soon :) --[[Paweł|ptecza]]
 >>> [[bugs/garbled_non-ascii_characters_in_body_in_web_interface]] fixes this.
 >>> --[[smcv]]
 
+>>>> Merged that patch. Not marking this page as done, because the todo
+>>>> about using a standard encoding still stands (although I'm not at
+>>>> all sure there's an encoding that would be better). --[[smcv]]
+
 [[wishlist]]
 [1]: https://packages.debian.org/search?suite=all&section=all&arch=any&searchon=names&keywords=libencode-imaputf7-perl