diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index b999eefe6a464154bfd4cb5b238fdde365942b70..1a83665d99cdb2082b4b21b3001be19327841f91 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -302,9 +302,9 @@ function conf($dolibarr_main_document_root) if (empty($character_set_client)) $character_set_client="UTF-8"; $conf->file->character_set_client=strtoupper($character_set_client); - if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set=($conf->db->type=='mysql'?'latin1':''); // Old installation + if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set=($conf->db->type=='mysql'?'latin1':''); // With old installation, var is not defined. New one, constant should be set to utf8 $conf->db->character_set=$dolibarr_main_db_character_set; - if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation=($conf->db->type=='mysql'?'latin1_swedish_ci':''); // Old installation + if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation=($conf->db->type=='mysql'?'latin1_swedish_ci':''); // With old installation, var is not defined. New one, constant should be set to utf8_general_ci $conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation; if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption=0; $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;