From 97a8d30dc1e7928253d55d12d372c0769683a865 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 12 May 2011 17:50:25 -0400
Subject: Support YAML::XS by not passing decoded unicode to Load. Closes:
 #625713

---
 IkiWiki/Setup/Yaml.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki')

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 ($@) {
-- 
cgit v1.2.3