diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2012-03-19 14:51:28 +0100 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-19 14:51:28 +0100 |
| commit | 1ce0c424dd33d3b72ee61f5b812802ec0f073880 (patch) | |
| tree | d5405ead3cdccbf115a601df0fb03b2d5e46a45e /system/database/drivers/mysql | |
| parent | 994105cb45eba44b62bab41dfce76582b34c6913 (diff) | |
| parent | 7eea3064af3be5dd0b526056211a510f90a40766 (diff) | |
merged with latest develop.
Diffstat (limited to 'system/database/drivers/mysql')
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 071ce4327..ba646d226 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -144,10 +144,9 @@ class CI_DB_mysql_driver extends CI_DB { * Set client character set * * @param string - * @param string * @return bool */ - protected function _db_set_charset($charset, $collation) + protected function _db_set_charset($charset) { return @mysql_set_charset($charset, $this->conn_id); } |