diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3e407644121..d821ad2b454 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -220,8 +220,8 @@ if (! defined('SYSLOG_FILE')) // To avoid warning on systems with constant alrea else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) define('SYSLOG_FILE','../../../../dolibarr_install.log'); // For DoliWamp else if (@is_writable('../../')) define('SYSLOG_FILE','../../dolibarr_install.log'); // For others //print 'SYSLOG_FILE='.SYSLOG_FILE;exit; - if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE'); } +if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE'); if (! defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR',1); // We init log handler for install $handlers = array('mod_syslog_file'); @@ -326,8 +326,8 @@ function conf($dolibarr_main_document_root) else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) define('SYSLOG_FILE','../../../../dolibarr_install.log'); // For DoliWamp else if (@is_writable('../../')) define('SYSLOG_FILE','../../dolibarr_install.log'); // For others //print 'SYSLOG_FILE='.SYSLOG_FILE;exit; - if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE'); } + if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE'); if (! defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR',1); // We init log handler for install $handlers = array('mod_syslog_file'); diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php index d11ac64e4c7..bf4953dde07 100644 --- a/htdocs/install/step1.php +++ b/htdocs/install/step1.php @@ -663,7 +663,7 @@ if (! $error && $db->connected && $action == "set") $check1=$newdb->getDefaultCharacterSetDatabase(); $check2=$newdb->getDefaultCollationDatabase(); - dolibarr_install_syslog('step1: note that default server was charset=' . $check1 . ' collation=' . $check2); + dolibarr_install_syslog('step1: note that new database is using charset=' . $check1 . ' collation=' . $check2); // If values differs, we save conf file again //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);