fix unicode with YAML::Syck

Syck-- it doesn't use unicode by default?! Hello, 2010 calling..

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index 8b876e297527af0de21bb8e70d63e5ddcbfdd14e..904784728e0a0cbc6314cf26006010b5e5d25d8a 100644 (file)
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -13,6 +13,7 @@ sub loaddump ($$) {
        eval q{use YAML::Any};
        eval q{use YAML} if $@;
        die $@ if $@;
        eval q{use YAML::Any};
        eval q{use YAML} if $@;
        die $@ if $@;

+       $YAML::Syck::ImplicitUnicode=1;

        IkiWiki::Setup::merge(Load($content));
 }
 
        IkiWiki::Setup::merge(Load($content));
 }
 

diff --git a/ikiwiki.in b/ikiwiki.in
index 1758399ea83e0380a4cc90337c5a3edfe0135327..b62962ad8892841b9c28b0c649345514e493f5e1 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -103,6 +103,7 @@ sub getconfig () {
                                }
                                eval q{use YAML::Any};
                                eval q{use YAML} if $@;
                                }
                                eval q{use YAML::Any};
                                eval q{use YAML} if $@;

+                               $YAML::Syck::ImplicitUnicode=1;

                                die $@ if $@;
                                $config{$var}=Load($val."\n");
                        },
                                die $@ if $@;
                                $config{$var}=Load($val."\n");
                        },