Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / IkiWiki / Setup / Yaml.pm

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 0fc2736756d73ba099b27961a2772a769731b204..904784728e0a0cbc6314cf26006010b5e5d25d8a 100644 (file)
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -10,17 +10,16 @@ sub loaddump ($$) {
        my $class=shift;
        my $content=shift;
 
-       eval q{use YAML};
+       eval q{use YAML::Any};
+       eval q{use YAML} if $@;
        die $@ if $@;
+       $YAML::Syck::ImplicitUnicode=1;
        IkiWiki::Setup::merge(Load($content));
 }
 
 sub gendump ($@) {
        my $class=shift;
        
-       eval q{use YAML};
-       die $@ if $@;
-
        "# IkiWiki::Setup::Yaml - YAML formatted setup file",
        "#",
        (map { "# $_" } @_),
@@ -35,7 +34,11 @@ sub dumpline ($$$$) {
        my $type=shift;
        my $prefix=shift;
        
+       eval q{use YAML::Old};
+       eval q{use YAML} if $@;
+       die $@ if $@;
        $YAML::UseHeader=0;
+
        my $dump=Dump({$key => $value});
        chomp $dump;
        if (length $prefix) {