[FEATURE] Docs: Revice upgrade instructions

[jirafeau_mojo42.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 37951221130c3bcb5171011d54b3a658267e7b88..d61963733efdc4ab7009a02c255649660c56b079 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -21,15 +21,18 @@ global $cfg;
 
 // Read config files
 require (JIRAFEAU_ROOT . 'lib/config.original.php');
 
 // Read config files
 require (JIRAFEAU_ROOT . 'lib/config.original.php');

-

 if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.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');
        require (JIRAFEAU_ROOT . 'lib/config.local.php');

+       $cfg = array_merge($cfgOriginal, $cfg);
+       unset($cfgOriginal);

 }
 
 /* Jirafeau constants */
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
 }
 
 /* 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/');
 
 /* Directories. */
 define ('VAR_FILES', $cfg['var_root'] . 'files/');