summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/mysql/mysql_driver.php2
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php2
-rw-r--r--system/database/drivers/postgre/postgre_driver.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 76f50368f..3fafe3fd8 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -153,7 +153,7 @@ class CI_DB_mysql_driver extends CI_DB {
{
log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");
$this->close();
- return ($this->db->debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;
+ return ($this->db->debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;
}
if ($this->stricton)
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index f9a20ea2f..847544780 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -177,7 +177,7 @@ class CI_DB_mysqli_driver extends CI_DB {
{
log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");
$mysqli->close();
- return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;
+ return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;
}
return $mysqli;
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index e4db12d69..2d4e5a5d5 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -163,11 +163,11 @@ class CI_DB_postgre_driver extends CI_DB {
return FALSE;
}
- if (pg_set_client_encoding($this->conn_id, $charset) !== 0)
+ if (pg_set_client_encoding($this->conn_id, $this->char_set) !== 0)
{
log_message('error', "Database: Unable to set the configured connection charset ('{$this->char_set}').");
pg_close($this->conn_id);
- return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $charset) : FALSE;
+ return ($this->db->db_debug) ? $this->display_error('db_unable_to_set_charset', $this->char_set) : FALSE;
}
empty($this->schema) OR $this->simple_query('SET search_path TO '.$this->schema.',public');