summaryrefslogtreecommitdiffstats
path: root/system/database/drivers
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-02-13 06:22:38 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-02-13 06:22:38 +0100
commitb1f90dbfd5fb7610865c4ff31b9d75bc821560a7 (patch)
tree68d6f40c870dde36bc5bdb22d6ff9e377f4a0576 /system/database/drivers
parent973b8844792c0b6930a2adf38b3f077c71326b24 (diff)
reapplied implementation of db_set_charset() for MySQLi...
Diffstat (limited to 'system/database/drivers')
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index aaeab5765..73396c594 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -96,8 +96,7 @@ class CI_DB_mysqli_driver extends CI_DB {
*/
function db_set_charset($charset, $collation)
{
- // TODO - add support if needed
- return TRUE;
+ return @mysqli_query($this->conn_id, "SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'");
}
// --------------------------------------------------------------------