[FEATURE] Install script: Simplify config generation

[jirafeau_mojo42.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 37951221130c3bcb5171011d54b3a658267e7b88..316741431ca3cc1e3ba12cd94308f0c948d41243 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -21,10 +21,13 @@ global $cfg;
 
 // Read config files
 require (JIRAFEAU_ROOT . 'lib/config.original.php');
-
 if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
 {
+       // read local copy and merge with original values
+       $cfgOriginal = $cfg;
        require (JIRAFEAU_ROOT . 'lib/config.local.php');
+       $cfg = array_merge($cfgOriginal, $cfg);
+       unset($cfgOriginal);
 }
 
 /* Jirafeau constants */