diff options
| author | Nathan Gass | 2021-03-01 11:46:56 +0100 |
|---|---|---|
| committer | Nathan Gass | 2021-03-01 11:46:56 +0100 |
| commit | 0712917cc50e0b09ba82b2accfaca2525f6f42fe (patch) | |
| tree | afe07c98e2e4d5eeb02cc5b15867181b5d1381b5 | |
| parent | 56a6b888356a934d6f78703139a25e4beab77451 (diff) | |
| download | itools-0712917cc50e0b09ba82b2accfaca2525f6f42fe.tar.gz itools-0712917cc50e0b09ba82b2accfaca2525f6f42fe.tar.bz2 itools-0712917cc50e0b09ba82b2accfaca2525f6f42fe.zip | |
do not use mysql defaultconfig for it_dbi_postgres.class
| -rw-r--r-- | it_dbi.class | 2 |
1 files changed, 1 insertions, 1 deletions
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; |