From 0712917cc50e0b09ba82b2accfaca2525f6f42fe Mon Sep 17 00:00:00 2001 From: Nathan Gass Date: Mon, 1 Mar 2021 11:46:56 +0100 Subject: do not use mysql defaultconfig for it_dbi_postgres.class --- it_dbi.class | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it_dbi.class b/it_dbi.class index d8a3393..e371101 100644 --- a/it_dbi.class +++ b/it_dbi.class @@ -76,7 +76,7 @@ function __construct($p = array(), $query = null, ...$args) $p += $dp; # Combine our settings with user's defaults and class defaults - $p += (array)$GLOBALS['it_dbi_defaultconfig'] + array('db' => $GLOBALS['ULTRADB']) + $this->_defaultconfig + array('charset' => strtr(strtolower(ini_get('default_charset')), array('iso-8859-1' => 'latin1', 'utf-8' => 'utf8mb4', 'utf8' => 'utf8mb4'))); + $p += (array)$GLOBALS[static::$_global_key . '_defaultconfig'] + array('db' => $GLOBALS['ULTRADB']) + $this->_defaultconfig + array('charset' => strtr(strtolower(ini_get('default_charset')), array('iso-8859-1' => 'latin1', 'utf-8' => 'utf8mb4', 'utf8' => 'utf8mb4'))); unset($this->_defaultconfig); # to shorten ED() output $this->_p = $p; -- cgit v1.2.3