X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/af7e43a4a3bbcb62912eabd75537480bf696b265..39a36cda14d2445dc4dfd66c6650f7211fadd36a:/lib/settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 3795122..d619637 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -21,15 +21,18 @@ 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 */
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '1.2.0');
+define ('JIRAFEAU_VERSION', '2.0.0');
 
 /* Directories. */
 define ('VAR_FILES', $cfg['var_root'] . 'files/');