From c6aa069705537da1cc6b6df5ea8f176f72516cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 20 Apr 2023 18:32:09 +0200 Subject: [PATCH 1/3] Fix :heart_eyes: in dolibarr when using utf8mb4 --- htdocs/core/db/mysqli.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index aaeaaf4c910..ff38a549938 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -112,7 +112,7 @@ class DoliDBMysqli extends DoliDB $this->ok = true; // If client is old latin, we force utf8 - $clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set; + $clientmustbe = empty($conf->db->character_set) ? 'utf8' : $conf->db->db_character_set; if (preg_match('/latin1/', $clientmustbe)) { $clientmustbe = 'utf8'; } From 9ae24a03697762eda3a45564b4883d718335f2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 20 Apr 2023 18:46:40 +0200 Subject: [PATCH 2/3] fix bad edit :flushed: --- htdocs/core/db/mysqli.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index ff38a549938..837ec5d385c 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -112,7 +112,7 @@ class DoliDBMysqli extends DoliDB $this->ok = true; // If client is old latin, we force utf8 - $clientmustbe = empty($conf->db->character_set) ? 'utf8' : $conf->db->db_character_set; + $clientmustbe = empty($conf->db->character_set) ? 'utf8' : $conf->db->character_set; if (preg_match('/latin1/', $clientmustbe)) { $clientmustbe = 'utf8'; } From 163bd91ebe4dc1d0afa4c00daf5beea1ecfeb00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 20 Apr 2023 18:53:04 +0200 Subject: [PATCH 3/3] Update mysqli.class.php --- htdocs/core/db/mysqli.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 837ec5d385c..68906fbf481 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -142,7 +142,7 @@ class DoliDBMysqli extends DoliDB if ($this->connected) { // If client is old latin, we force utf8 - $clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set; + $clientmustbe = empty($conf->db->character_set) ? 'utf8' : $conf->db->character_set; if (preg_match('/latin1/', $clientmustbe)) { $clientmustbe = 'utf8'; }