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
2016-07-26 07:31:42 +00:00
parent 0c9847042b
commit a4b9eb0267
1 changed files with 6 additions and 0 deletions
--- a/config.php
+++ b/config.php
@@ -94,6 +94,12 @@ class config
    // Create a conf where all the keys are defined. If the keys are already
    // define, use them, or use the 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)
    {
      if ($key === "not configured")