Commit 4bbc20bd authored by IKEDA Soji's avatar IKEDA Soji
Browse files

[bug] If a list parameter had a value "default", default value (if defined)...

[bug] If a list parameter had a value "default", default value (if defined) was used instead of the value itself.
Fixed by removing a code replacing value "default". Exception is the case of scenarios: For compatibility, special value "default" will stand for default scenario name.
parent 10fa8b07
......@@ -6417,9 +6417,11 @@ sub _load_include_admin_user_file {
unless (defined $hash{$k}) {
if (defined $pinfo->{$pname}{'file_format'}{$k}{'default'}
) {
$hash{$k} =
$self->_load_list_param($k, 'default',
$pinfo->{$pname}{'file_format'}{$k});
$hash{$k} = $self->_load_list_param(
$k,
$pinfo->{$pname}{'file_format'}{$k}{'default'},
$pinfo->{$pname}{'file_format'}{$k}
);
}
}
## Required fields
......@@ -8152,8 +8154,9 @@ sub _load_list_param {
return undef;
}
## Default
if ($value eq 'default') {
# For compatibility to <= 6.2.40: Special name "default" stands for
# the default scenario.
if ($p->{'scenario'} and $value eq 'default') {
$value = $p->{'default'};
}
......@@ -8430,9 +8433,11 @@ sub _load_list_config_file {
unless (defined $hash{$k}) {
if (defined $pinfo->{$pname}{'file_format'}{$k}{'default'}
) {
$hash{$k} =
$self->_load_list_param($k, 'default',
$pinfo->{$pname}{'file_format'}{$k});
$hash{$k} = $self->_load_list_param(
$k,
$pinfo->{$pname}{'file_format'}{$k}{'default'},
$pinfo->{$pname}{'file_format'}{$k}
);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment