diff options
| author | Florian Pritz <bluewind@xinu.at> | 2023-01-29 13:58:21 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2023-01-29 13:58:21 +0100 |
| commit | c88be04f0ec35304be812d7f5379c4362008b730 (patch) | |
| tree | 0d161faf7b5d03396fcab28e1ecb8e8764f32cb2 /system/database/drivers/mysqli | |
| parent | 457e351cbc1335de951f4ac79bb91a9f3ea9ab38 (diff) | |
| parent | a6faab2ebf082eefff9c2422fce016e49da548bf (diff) | |
Merge remote-tracking branch 'upstream/develop' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/database/drivers/mysqli')
| -rw-r--r-- | system/database/drivers/mysqli/index.html | 2 | ||||
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/system/database/drivers/mysqli/index.html b/system/database/drivers/mysqli/index.html index b702fbc39..bcb7cae34 100644 --- a/system/database/drivers/mysqli/index.html +++ b/system/database/drivers/mysqli/index.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> <title>403 Forbidden</title> </head> diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index f5e994960..61e7adee3 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -223,6 +223,13 @@ class CI_DB_mysqli_driver extends CI_DB { return ($this->db_debug) ? $this->display_error($message, '', TRUE) : FALSE; } + if ( ! $this->_mysqli->set_charset($this->char_set)) + { + log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}')."); + $this->_mysqli->close(); + return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE; + } + return $this->_mysqli; } @@ -275,19 +282,6 @@ class CI_DB_mysqli_driver extends CI_DB { // -------------------------------------------------------------------- /** - * Set client character set - * - * @param string $charset - * @return bool - */ - protected function _db_set_charset($charset) - { - return $this->conn_id->set_charset($charset); - } - - // -------------------------------------------------------------------- - - /** * Database version number * * @return string |