config : allow the first values to not be an array
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@2959 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
@@ -94,6 +94,12 @@ class config
|
|||||||
// Create a conf where all the keys are defined. If the keys are already
|
// Create a conf where all the keys are defined. If the keys are already
|
||||||
// define, use them, or use the default ones
|
// define, use them, or use the default ones
|
||||||
// Don't allow keys not defined in default ones
|
// Don't allow keys not defined in default ones
|
||||||
|
if (! is_array ($this->default[$param]))
|
||||||
|
{
|
||||||
|
if (! array_key_exists ($param, $conf))
|
||||||
|
return $this->default[$param];
|
||||||
|
return $conf[$param];
|
||||||
|
}
|
||||||
foreach ($this->default[$param] as $key=>$val)
|
foreach ($this->default[$param] as $key=>$val)
|
||||||
{
|
{
|
||||||
if ($key === "not configured")
|
if ($key === "not configured")
|
||||||
|
|||||||
Reference in New Issue
Block a user