Bump version

[galette.git] / galette / includes / galette.inc.php

diff --git a/galette/includes/galette.inc.php b/galette/includes/galette.inc.php
index 0d5cce8549af07f660814b03e0ca946bdf2da7df..00f62fb301be23bff6511a8742b1836c104906d0 100644 (file)
--- a/galette/includes/galette.inc.php
+++ b/galette/includes/galette.inc.php
@@ -68,8 +68,6 @@ $installed = file_exists(GALETTE_CONFIG_PATH . 'config.inc.php');
 if (!$installed && !$installer) {
     header('location: ./installer.php');
     die();
-} else if ($installed) {
-    include_once GALETTE_CONFIG_PATH . 'config.inc.php';
 }
 
 if (
@@ -79,6 +77,11 @@ if (
     include_once GALETTE_CONFIG_PATH . 'behavior.inc.php';
 }
 
+if (isset($installer) && $installer !== true) {
+    //If we're not working from installer
+    include_once GALETTE_CONFIG_PATH . 'config.inc.php';
+}
+
 use Analog\Analog;
 use Analog\Handler;
 use Analog\Handler\LevelName;
@@ -97,7 +100,7 @@ if (
 }
 
 define('GALETTE_NIGHTLY', false);
-define('GALETTE_VERSION', 'v0.9.6');
+define('GALETTE_VERSION', 'v0.9.6.1');
 
 //Version to display
 if (!defined('GALETTE_HIDE_VERSION')) {
@@ -181,8 +184,9 @@ Analog::handler($galette_run_log);
 
 require_once GALETTE_ROOT . 'includes/functions.inc.php';
 
-//If we're not working from tests
-if ($installed && !defined('GALETTE_TESTS')) {
+if (!$installer and !defined('GALETTE_TESTS')) {
+    //If we're not working from installer nor from tests
+    include_once GALETTE_CONFIG_PATH . 'config.inc.php';
 
     /**
      * Database instantiation