if (!$installed && !$installer) {
header('location: ./installer.php');
die();
+} else if ($installed) {
+ include_once GALETTE_CONFIG_PATH . 'config.inc.php';
}
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;
}
define('GALETTE_NIGHTLY', false);
-define('GALETTE_VERSION', 'v0.9.5');
+define('GALETTE_VERSION', 'v0.9.5.2');
//Version to display
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' => '/'
+ ]
);
}
if (!defined('GALETTE_DISPLAY_ERRORS')) {
- if (GALETTE_MODE === 'DEV') {
+ if (GALETTE_MODE === \Galette\Core\Galette::MODE_DEV) {
define('GALETTE_DISPLAY_ERRORS', 1);
} else {
define('GALETTE_DISPLAY_ERRORS', 0);
}
}
-ini_set('display_errors', 0);
+ini_set('display_errors', (defined('GALETTE_TESTS') ? '1' : '0'));
/*------------------------------------------------------------------------------
Logger stuff
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();
}
$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);