From a892a3fe71dcf104a7122686604ca54f31d76401 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Jan 2018 12:10:03 +0100 Subject: [PATCH] Fix info of collation is wrong on log --- htdocs/core/db/mysqli.class.php | 3 ++- htdocs/install/step1.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 7721ebb975d..15d95e39194 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -903,7 +903,8 @@ class DoliDBMysqli extends DoliDB } /** - * Return charset used to store data in current database (same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";) + * Return charset used to store data in current database + * Note: if we are connected to databasename, it is same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";) * * @return string Charset * @see getDefaultCollationDatabase diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php index bf4953dde07..6b662e4306d 100644 --- a/htdocs/install/step1.php +++ b/htdocs/install/step1.php @@ -661,9 +661,10 @@ if (! $error && $db->connected && $action == "set") print ''; print 'Ok'; + $newdb->select_db($dolibarr_main_db_name); $check1=$newdb->getDefaultCharacterSetDatabase(); $check2=$newdb->getDefaultCollationDatabase(); - dolibarr_install_syslog('step1: note that new database is using charset=' . $check1 . ' collation=' . $check2); + dolibarr_install_syslog('step1: 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);