diff options
| author | Joey Hess <joey@kitenet.net> | 2011-05-12 17:50:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-12 17:50:25 -0400 |
| commit | 97a8d30dc1e7928253d55d12d372c0769683a865 (patch) | |
| tree | bcb5d711fa73ca96aabff04e4c3839c641a13134 /IkiWiki/Setup | |
| parent | 0c71184c42622b79b88ab64919e16c642ccc4f34 (diff) | |
| download | ikiwiki-97a8d30dc1e7928253d55d12d372c0769683a865.tar ikiwiki-97a8d30dc1e7928253d55d12d372c0769683a865.tar.gz | |
Support YAML::XS by not passing decoded unicode to Load. Closes: #625713
Diffstat (limited to 'IkiWiki/Setup')
| -rw-r--r-- | IkiWiki/Setup/Yaml.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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 ($@) { |