summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysqli
diff options
context:
space:
mode:
authorMike Funk <mfunk@xulonpress.com>2012-03-19 14:51:28 +0100
committerMike Funk <mfunk@xulonpress.com>2012-03-19 14:51:28 +0100
commit1ce0c424dd33d3b72ee61f5b812802ec0f073880 (patch)
treed5405ead3cdccbf115a601df0fb03b2d5e46a45e /system/database/drivers/mysqli
parent994105cb45eba44b62bab41dfce76582b34c6913 (diff)
parent7eea3064af3be5dd0b526056211a510f90a40766 (diff)
merged with latest develop.
Diffstat (limited to 'system/database/drivers/mysqli')
-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 e84b8346d..f38b94c13 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -144,10 +144,9 @@ class CI_DB_mysqli_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 @mysqli_set_charset($this->conn_id, $charset);
}