summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornarfbg <narf@bofh.bg>2011-09-17 20:38:46 +0200
committernarfbg <narf@bofh.bg>2011-09-17 20:38:46 +0200
commit068e3dea797351448f743b1e3faac506bc0f6e2a (patch)
treecc2a087b8782aac3baf29a372ce54e37c80b83cd
parent349070a24afb82576fdb05ceee85fc3cd28a099e (diff)
Fix ./system/database/drivers/oci8_driver.php to pass the configured database character set on connect.
-rw-r--r--system/database/drivers/oci8/oci8_driver.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index d4adfd528..d4c27fa43 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -79,7 +79,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function db_connect()
{
- return @ocilogon($this->username, $this->password, $this->hostname);
+ return @ocilogon($this->username, $this->password, $this->hostname, $this->char_set);
}
// --------------------------------------------------------------------
@@ -92,7 +92,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function db_pconnect()
{
- return @ociplogon($this->username, $this->password, $this->hostname);
+ return @ociplogon($this->username, $this->password, $this->hostname, $this->char_set);
}
// --------------------------------------------------------------------
@@ -136,7 +136,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function db_set_charset($charset, $collation)
{
- // @todo - add support if needed
+ // this is done upon connect
return TRUE;
}