websetup: Fix encoding problem when restoring old setup file.

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 0ab18997c860d90a2841064a0ffc536f195fd21a..9c032fdc6780884c86b13bdece90a9f972efc7f1 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -475,7 +475,7 @@ sub showform ($$) {
                                                join(" ", @command), $ret).
                                        '</p>';
                                open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
-                               print OUT $oldsetup;
+                               print OUT Encode::encode_utf8($oldsetup);
                                close OUT;
                        }
 

diff --git a/debian/changelog b/debian/changelog
index 582a8e36ae15ea13f62294474963b030ad8d45f2..91ff0964be38e4476a55a85760dc6a7bcd07d20e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20101113) UNRELEASED; urgency=low
+
+  * websetup: Fix encoding problem when restoring old setup file.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
+
 ikiwiki (3.20101112) unstable; urgency=HIGH
 
   * txt: Fix display when used inside a format directive.