aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-11-16 14:24:15 -0400
committerJoey Hess <joey@kitenet.net>2010-11-16 14:24:15 -0400
commitb85ca8603aecbd3523201d99edf019db1094b558 (patch)
treec83a96be5a47e397155ea05d920b55145edca362
parent65e726f201d7b9919271cfe7e8a7314a6abf0fc3 (diff)
downloadikiwiki-b85ca8603aecbd3523201d99edf019db1094b558.tar
ikiwiki-b85ca8603aecbd3523201d99edf019db1094b558.tar.gz
websetup: Fix encoding problem when restoring old setup file.
-rw-r--r--IkiWiki/Plugin/websetup.pm2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 0ab18997c..9c032fdc6 100644
--- 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 582a8e36a..91ff0964b 100644
--- 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.