move plugin toggles to before config setting again

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index f3d4994fb099a03fba7ee30a3071fbe4a37c9bf3..c87fb80f53021c4d203f9187f0dea43fe4db482a 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -28,12 +28,11 @@ sub dumpline ($$$$) { #{{{
        local $Data::Dumper::Quotekeys=0;
        
        my $dumpedvalue;
-       if ($type eq 'boolean' || $type eq 'integer') {
+       if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
                # avoid quotes
                $dumpedvalue=$value;
        }
-       elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
-           ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^-A-Za-z0-9_]/ } @$value) {
                # dump simple array as qw{}
                $dumpedvalue="[qw{ ".join(" ", @$value)." }]";
        }
@@ -63,7 +62,7 @@ sub dumpvalues ($@) { #{{{
                my $key=shift;
                my %info=%{shift()};
 
-               next if $info{type} eq "internal";
+               next if $info{type} eq "internal" || $key eq "plugin";
                
                push @ret, "\t# ".$info{description} if exists $info{description};