X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/af7e43a4a3bbcb62912eabd75537480bf696b265..1ed002b703c25eb4c68fab84f3bd70b649d65803:/lib/settings.php?ds=sidebyside diff --git a/lib/settings.php b/lib/settings.php index 3795122..3167414 100644 --- 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 */