summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-12-14 16:56:14 +0100
committerAndrey Andreev <narf@devilix.net>2015-12-14 16:56:14 +0100
commit85bc9fc53e4c3e46b2f4e1b1eac7e2828d4869e6 (patch)
tree78abe651f52c39be43a3e22ba38c1e83160a7bc8 /system/database/DB_driver.php
parent788fb4aa823179e7c4401f5384207d916697bb7e (diff)
Change DB charset handling
Close #4311
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r--system/database/DB_driver.php32
1 files changed, 2 insertions, 30 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 885a814be..af6b9f399 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -380,7 +380,7 @@ abstract class CI_DB_driver {
/**
* Initialize Database Settings
*
- * @return bool
+ * @return void
* @throws RuntimeException In case of failure
*/
public function initialize()
@@ -393,7 +393,7 @@ abstract class CI_DB_driver {
*/
if ($this->conn_id)
{
- return TRUE;
+ return;
}
// ----------------------------------------------------------------
@@ -433,9 +433,6 @@ abstract class CI_DB_driver {
throw new RuntimeException('Unable to connect to the database.');
}
}
-
- // Now we set the character set and that's all
- return $this->db_set_charset($this->char_set);
}
// --------------------------------------------------------------------
@@ -511,31 +508,6 @@ abstract class CI_DB_driver {
// --------------------------------------------------------------------
/**
- * Set client character set
- *
- * @param string
- * @return bool
- */
- public function db_set_charset($charset)
- {
- if (method_exists($this, '_db_set_charset') && ! $this->_db_set_charset($charset))
- {
- log_message('error', 'Unable to set database connection charset: '.$charset);
-
- if ($this->db_debug)
- {
- $this->display_error('db_unable_to_set_charset', $charset);
- }
-
- return FALSE;
- }
-
- return TRUE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* The name of the platform in use (mysql, mssql, etc...)
*
* @return string