diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-03 03:27:10 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-03 03:27:10 +0100 |
| commit | 34f75799285ca39741deaba9955ea07e6b9756a5 (patch) | |
| tree | 95443cad80232e378231e965fc1f1398acf7b0f8 /system/database/drivers/mysql | |
| parent | 80e34f9cbd722193a5bdb94f4b593ae98c10efc7 (diff) | |
| parent | a19beb0c580ac78c4b75548a046240a85f30cb29 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/mysql')
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 7108a6db1..84f7791c7 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -147,7 +147,7 @@ class CI_DB_mysql_driver extends CI_DB { * @param string * @return bool */ - public function db_set_charset($charset, $collation) + protected function _db_set_charset($charset, $collation) { return function_exists('mysql_set_charset') ? @mysql_set_charset($charset, $this->conn_id) |