diff options
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/websetup.pm | 7 | ||||
| -rwxr-xr-x | ikiwiki.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index bf4a0d415..e1c4b6e2f 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1045,7 +1045,7 @@ sub preprocess ($$$;$$) { #{{{ my $params=shift; $params="" if ! defined $params; - f (length $escape) { + if (length $escape) { return "[[$prefix$command $params]]"; } elsif (exists $hooks{preprocess}{$command}) { diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 2a5e27bf9..b110939e4 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -349,7 +349,10 @@ sub showform ($$) { #{{{ next; } + print STDERR "on $key\n"; + if (ref $config{$key} eq "ARRAY" || ref $info{example} eq "ARRAY") { + print STDERR "$key is array\n"; @value=sort grep { length $_ } @value; my @oldvalue=sort grep { length $_ } (defined $config{$key} ? @{$config{$key}} : ()); @@ -365,16 +368,20 @@ sub showform ($$) { #{{{ } else { if (defined $config{$key} && $config{$key} eq $value[0]) { + print STDERR "$key SET SAME ($config{$key})\n"; delete $rebuild{$field}; } elsif (! defined $config{$key} && ! length $value[0]) { + print STDERR "$key UNDEF and unset\n"; delete $rebuild{$field}; } elsif ((! defined $config{$key} || ! $config{$key}) && ! $value[0] && $info{type} eq "boolean") { + print STDERR "omitting false $key\n"; delete $rebuild{$field}; } else { + print STDERR "for $key : $value[0] vs $config{$key}; type: $info{type}\n"; $config{$key}=$value[0]; } } diff --git a/ikiwiki.in b/ikiwiki.in index d8e848f87..beb405227 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -132,7 +132,7 @@ sub main () { #{{{ foreach my $wrapper (@wrappers) { %config=(%origconfig, rebuild => 0, - verbose => 0, + verbose => undef, %{$wrapper}, ); checkconfig(); |