[BUGFIX] Remove redundant style fallback

[jirafeau_mojo42.git] / lib / settings.php

diff --git a/lib/settings.php b/lib/settings.php
index 3a9f450172471d1b9feb3a3216791145c387bc9b..d61963733efdc4ab7009a02c255649660c56b079 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -17,9 +17,22 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+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/');
@@ -40,4 +53,6 @@ define ('JIRAFEAU_MONTH', 2419200); // JIRAFEAU_WEEK * 4
 define ('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
 define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12
 
+
+
 ?>