X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3b08789e6fb5809dd9b8f51f5c5e7df1d78e6930..6c3cdb04ac1794d2b3fd24f7da4c9ec4aac05d11:/IkiWiki/Setup/Yaml.pm

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index c7ff1988e..6bf20f480 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -5,22 +5,20 @@ package IkiWiki::Setup::Yaml;
 use warnings;
 use strict;
 use IkiWiki;
+use Encode;
 
 sub loaddump ($$) {
 	my $class=shift;
 	my $content=shift;
 
-	eval q{use YAML};
+	eval q{use YAML::XS};
 	die $@ if $@;
-	IkiWiki::Setup::merge(Load($content));
+	IkiWiki::Setup::merge(Load(encode_utf8($content)));
 }
 
 sub gendump ($@) {
 	my $class=shift;
 	
-	eval q{use YAML};
-	die $@ if $@;
-
 	"# IkiWiki::Setup::Yaml - YAML formatted setup file",
 	"#",
 	(map { "# $_" } @_),
@@ -35,11 +33,15 @@ sub dumpline ($$$$) {
 	my $type=shift;
 	my $prefix=shift;
 	
-	$YAML::UseHeader=0;
-	my $dump=Dump({$key => $value});
+	eval q{use YAML::XS};
+	die $@ if $@;
+	$YAML::XS::QuoteNumericStrings=0;
+
+	my $dump=decode_utf8(Dump({$key => $value}));
+	$dump=~s/^---\n//; # yaml header, we don't want
 	chomp $dump;
 	if (length $prefix) {
-		$dump=join("", map { $prefix.$_ } split(/\n/, $dump));
+		$dump=join("\n", map { $prefix.$_ } split(/\n/, $dump));
 	}
 	return $dump;
 }