diff options
| author | Joey Hess <joey@kitenet.net> | 2010-11-16 14:24:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-16 14:24:15 -0400 |
| commit | b85ca8603aecbd3523201d99edf019db1094b558 (patch) | |
| tree | c83a96be5a47e397155ea05d920b55145edca362 | |
| parent | 65e726f201d7b9919271cfe7e8a7314a6abf0fc3 (diff) | |
websetup: Fix encoding problem when restoring old setup file.
| -rw-r--r-- | IkiWiki/Plugin/websetup.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
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. |