must check that directives that have only one element are turned into arrays
This commit is contained in:
parent
5115e364eb
commit
2de0a4bb2b
1 changed files with 4 additions and 11 deletions
|
|
@ -150,17 +150,10 @@ sub readConfig {
|
||||||
foreach my $key ($config->directives) {
|
foreach my $key ($config->directives) {
|
||||||
$data{$key} = $config->get($key);
|
$data{$key} = $config->get($key);
|
||||||
}
|
}
|
||||||
if (ref $data{assetAddPrivilege} ne "ARRAY") {
|
foreach my $directive (qw(assetAddPrivilege assets utilityAssets assetContainers authMethods paymentPlugins)) {
|
||||||
$data{assetAddPrivilege} = [$data{assetAddPrivilege}];
|
if (ref $data{$directive} ne "ARRAY") {
|
||||||
}
|
$data{$directive} = [$data{$directive}];
|
||||||
if (ref $data{authMethods} ne "ARRAY") {
|
}
|
||||||
$data{authMethods} = [$data{authMethods}];
|
|
||||||
}
|
|
||||||
if (ref $data{wobjects} ne "ARRAY"){
|
|
||||||
$data{wobjects} = [$data{wobjects}];
|
|
||||||
}
|
|
||||||
if (ref $data{paymentPlugins} ne "ARRAY") {
|
|
||||||
$data{paymentPlugins} = [$data{paymentPlugins}] if ($data{paymentPlugins});
|
|
||||||
}
|
}
|
||||||
if( defined( $data{scripturl} ) ) {
|
if( defined( $data{scripturl} ) ) {
|
||||||
# get rid of leading "/" if present.
|
# get rid of leading "/" if present.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue