summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-03 02:57:26 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-03 02:57:26 +0100
commita6a1496b27c87718106645b6f1438023a18ad40c (patch)
tree10a079edd19b1b71beb8c2b517a9ed7ed590823a /system
parent8335a5db2a44b9272b066f524223b58904dd9f3f (diff)
Remove pg_set_client_encoding() from db_connect(), db_pconnect()
Diffstat (limited to 'system')
-rw-r--r--system/database/drivers/postgre/postgre_driver.php16
1 files changed, 2 insertions, 14 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index ce5dc96c3..d8b43695c 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -126,13 +126,7 @@ class CI_DB_postgre_driver extends CI_DB {
*/
public function db_connect()
{
- $ret = @pg_connect($this->dsn);
- if (is_resource($ret) && $this->char_set != '')
- {
- pg_set_client_encoding($ret, $this->char_set);
- }
-
- return $ret;
+ return @pg_connect($this->dsn);
}
// --------------------------------------------------------------------
@@ -144,13 +138,7 @@ class CI_DB_postgre_driver extends CI_DB {
*/
public function db_pconnect()
{
- $ret = @pg_pconnect($this->dsn);
- if (is_resource($ret) && $this->char_set != '')
- {
- pg_set_client_encoding($ret, $this->char_set);
- }
-
- return $ret;
+ return @pg_pconnect($this->dsn);
}
// --------------------------------------------------------------------