diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-01 18:37:11 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-01 18:37:11 +0100 |
| commit | 718d9ef22c4663f59f6f43c8945944f1f165c800 (patch) | |
| tree | 0c071f860f7fd8d9ab1480f67fc1c39e56f27991 /system/database/drivers/postgre | |
| parent | 386c089ea519643b6e4b73508d571206a5a8c152 (diff) | |
| parent | e3a68042c086acfc98ae273adbd8527af0c6ab8b (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/postgre')
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 89c0cd0c9..4e77b9f1c 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -190,10 +190,9 @@ class CI_DB_postgre_driver extends CI_DB { * Set client character set * * @param string - * @param string * @return bool */ - public function db_set_charset($charset, $collation) + protected function _db_set_charset($charset) { return (pg_set_client_encoding($this->conn_id, $charset) === 0); } |