From 35877b13825b2c3db44ff89977344b84f8e21d9a Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 10 Feb 2022 18:57:44 +0000 Subject: allow to override the DB charset via the $db_charset variable in .htconfig.php --- include/dba/dba_pdo.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/dba/dba_pdo.php') diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php index 2137ca0cc..c8a1b6c85 100644 --- a/include/dba/dba_pdo.php +++ b/include/dba/dba_pdo.php @@ -14,7 +14,7 @@ class dba_pdo extends dba_driver { * {@inheritDoc} * @see dba_driver::connect() */ - function connect($server, $scheme, $port, $user, $pass, $db) { + function connect($server, $scheme, $port, $user, $pass, $db, $db_charset) { $this->driver_dbtype = $scheme; @@ -28,10 +28,10 @@ class dba_pdo extends dba_driver { $dsn .= ';dbname=' . $db; if ($this->driver_dbtype === 'mysql') { - $dsn .= ';charset=utf8mb4'; + $dsn .= ';charset=' . $db_charset; } else { - $dsn .= ";options='--client_encoding=UTF8'"; + $dsn .= ";options='--client_encoding=" . $db_charset . "'"; } try { -- cgit v1.2.3