Bump version

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

diff --git a/galette/includes/galette.inc.php b/galette/includes/galette.inc.php
index 0864ca392a4a7e851bf1d30f9ef5100ef0542ba8..3f28b98200234f3d9fb385a67fc06f740c436adb 100644 (file)
--- a/galette/includes/galette.inc.php
+++ b/galette/includes/galette.inc.php
@@ -68,6 +68,8 @@ $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 (
@@ -77,11 +79,6 @@ 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;
@@ -100,7 +97,7 @@ if (
 }
 
 define('GALETTE_NIGHTLY', false);
-define('GALETTE_VERSION', 'v0.9.5');
+define('GALETTE_VERSION', 'v0.9.5.1');
 
 //Version to display
 if (!defined('GALETTE_HIDE_VERSION')) {
@@ -110,14 +107,17 @@ if (!defined('GALETTE_HIDE_VERSION')) {
 define('GALETTE_COMPAT_VERSION', '0.9.5');
 define('GALETTE_DB_VERSION', '0.950');
 if (!defined('GALETTE_MODE')) {
-    define('GALETTE_MODE', 'PROD'); //DEV, PROD, MAINT or DEMO
+    define('GALETTE_MODE', \Galette\Core\Galette::MODE_PROD);
 }
 
 if (!isset($_COOKIE['show_galette_dashboard'])) {
     setcookie(
         'show_galette_dashboard',
         true,
-        time() + 31536000 //valid for a year
+        [
+            'expires'   => time() + 31536000, //valid for a year
+            'path'      => '/'
+        ]
     );
 }
 
@@ -181,12 +181,11 @@ Analog::handler($galette_run_log);
 
 require_once GALETTE_ROOT . 'includes/functions.inc.php';
 
-if (!$installer and !defined('GALETTE_TESTS')) {
-    //If we're not working from installer nor from tests
-    include_once GALETTE_CONFIG_PATH . 'config.inc.php';
+//If we're not working from tests
+if ($installed && !defined('GALETTE_TESTS')) {
 
     /**
-     * Database instanciation
+     * Database instantiation
      */
     $zdb = new Core\Db();
 
@@ -224,5 +223,5 @@ if (!$installer and !defined('GALETTE_TESTS')) {
 }
 
 $plugins = new Galette\Core\Plugins();
-//make sure plugins autoload is caleld before session start
+//make sure plugins autoload is called before session start
 $plugins->autoload(GALETTE_PLUGINS_PATH);