Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 8a11b2ec6ba366dd49049add8b9ad320d78faaf9..e6bff2826ff73497385d1dbd332c2bb842fc110d 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -26,6 +26,8 @@ sub dumpline ($$$$) { #{{{
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;

+       # only the perl version preserves utf-8 in output
+       local $Data::Dumper::Useperl=1;

        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {


@@ -86,7 +88,7 @@ sub gendump ($) { #{{{
        my @ret;
        
        # disable logging to syslog while dumping
        my @ret;
        
        # disable logging to syslog while dumping

-       $config{syslog}=0;
+       $config{syslog}=undef;

 
        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
        foreach my $pair (IkiWiki::Setup::getsetup()) {
 
        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
        foreach my $pair (IkiWiki::Setup::getsetup()) {