summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysql/mysql_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-12 15:22:28 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-12 15:22:28 +0100
commit95bd1d1a5f5bdccfde53cc27d7d5c20991112643 (patch)
treec42a5b8220225b805ac4a3bd8b0fd5f309557b69 /system/database/drivers/mysql/mysql_driver.php
parent6b4deae9143c4419654e4321fe49330eca493acf (diff)
Remove collation parameter from db_set_charset() (no longer needed)
Diffstat (limited to 'system/database/drivers/mysql/mysql_driver.php')
-rw-r--r--system/database/drivers/mysql/mysql_driver.php3
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);
}