diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-03-20 08:14:14 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-03-20 08:14:14 +0100 |
| commit | 62b655b92667f1e417a4f260a34ff447ddeee2c2 (patch) | |
| tree | 214320da373c733a35992bfe0334e3e8c7f5ef62 | |
| parent | ea0735264dfebd64858933e03a3b33323b14178e (diff) | |
Fix #5057
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 4 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 718fee7f5..bcdfc060a 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -130,9 +130,9 @@ class CI_DB_postgre_driver extends CI_DB { */ foreach (array('connect_timeout', 'options', 'sslmode', 'service') as $key) { - if (isset($this->$key) && is_string($this->key) && $this->key !== '') + if (isset($this->$key) && is_string($this->$key) && $this->$key !== '') { - $this->dsn .= $key."='".$this->key."' "; + $this->dsn .= $key."='".$this->$key."' "; } } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index fd6c1c790..32f2b81e6 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -36,6 +36,7 @@ Bug fixes for 3.1.4 - Fixed a bug (#4815) - :doc:`Database Library <database/index>` stripped URL-encoded sequences while escaping strings with the 'mssql' driver. - Fixed a bug (#5044) - :doc:`HTML Helper <helpers/html_helper>` function :php:func:`img()` didn't accept ``data:`` URI schemes for the image source. - Fixed a bug (#5050) - :doc:`Database Library <database/index>` tried to access an undefined property in a number of error handling cases. +- Fixed a bug (#5057) - :doc:`Database <database/index>` driver 'postgre' didn't actually apply extra options (such as 'connect_timeout') to its DSN. Version 3.1.3 ============= |