X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f401d6617a11efcedda1c956b2ccea061a7540f..8d4342183b1c3a96797def6fff96feebacb90db6:/IkiWiki/Setup/Yaml.pm

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 904784728..8edd7126b 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -5,16 +5,15 @@ package IkiWiki::Setup::Yaml;
 use warnings;
 use strict;
 use IkiWiki;
+use Encode;
 
 sub loaddump ($$) {
 	my $class=shift;
 	my $content=shift;
 
-	eval q{use YAML::Any};
-	eval q{use YAML} if $@;
+	eval q{use YAML::XS};
 	die $@ if $@;
-	$YAML::Syck::ImplicitUnicode=1;
-	IkiWiki::Setup::merge(Load($content));
+	IkiWiki::Setup::merge(Load(encode_utf8($content)));
 }
 
 sub gendump ($@) {
@@ -34,12 +33,14 @@ sub dumpline ($$$$) {
 	my $type=shift;
 	my $prefix=shift;
 	
-	eval q{use YAML::Old};
-	eval q{use YAML} if $@;
+	eval q{use YAML::XS};
 	die $@ if $@;
-	$YAML::UseHeader=0;
+	no warnings 'once';
+	$YAML::XS::QuoteNumericStrings=0;
+	use warnings;
 
-	my $dump=Dump({$key => $value});
+	my $dump=decode_utf8(Dump({$key => $value}));
+	$dump=~s/^---\n//; # yaml header, we don't want
 	chomp $dump;
 	if (length $prefix) {
 		$dump=join("\n", map { $prefix.$_ } split(/\n/, $dump));