X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=IkiWiki%2FSetup%2FYaml.pm;fp=IkiWiki%2FSetup%2FYaml.pm;h=6da93bb644bb5f639dd6871b492782cfa059345d;hp=904784728e0a0cbc6314cf26006010b5e5d25d8a;hb=97a8d30dc1e7928253d55d12d372c0769683a865;hpb=0c71184c42622b79b88ab64919e16c642ccc4f34

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 904784728..6da93bb64 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -5,6 +5,7 @@ package IkiWiki::Setup::Yaml;
 use warnings;
 use strict;
 use IkiWiki;
+use Encode;
 
 sub loaddump ($$) {
 	my $class=shift;
@@ -14,7 +15,7 @@ sub loaddump ($$) {
 	eval q{use YAML} if $@;
 	die $@ if $@;
 	$YAML::Syck::ImplicitUnicode=1;
-	IkiWiki::Setup::merge(Load($content));
+	IkiWiki::Setup::merge(Load(encode_utf8($content)));
 }
 
 sub gendump ($@) {