diff options
| author | Greg Aker <greg@gregaker.net> | 2011-12-25 08:33:51 +0100 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-12-25 08:33:51 +0100 |
| commit | a96ade374f28cdae97036fc253fd8b2a0e8dc81a (patch) | |
| tree | dfcc10c0f2c9969a609708f01a255e2351932730 | |
| parent | 11ce5da8c743b5f6592c83a2b91e545d76a8789b (diff) | |
| parent | 6f1fa5e6e40ae35bb8eeec359cb9f830b832c572 (diff) | |
Merge branch 'patch-4' of https://github.com/kylefarris/CodeIgniter into kylefarris-patch-4
Conflicts:
user_guide_src/source/changelog.rst
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index 0f9f57836..340cd3a66 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -98,7 +98,7 @@ class CI_DB_sqlsrv_driver extends CI_DB { */ function db_pconnect() { - $this->db_connect(TRUE); + return $this->db_connect(TRUE); } // -------------------------------------------------------------------- diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 4f060a4fa..54237e3c7 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -79,6 +79,7 @@ Bug fixes for 3.0 - Fixed a bug (#797) - timespan was using incorrect seconds for year and month. - Fixed a bug in CI_Cart::contents() where if called without a TRUE (or equal) parameter, it would fail due to a typo. - Fixed a bug (#696) - make oci_execute calls inside num_rows non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed. +- Fixed a bug (#406) - sqlsrv DB driver not reuturning resource on <samp>db_pconnect()</samp>. Version 2.1.0 ============= @@ -177,6 +178,7 @@ Bug fixes for 2.1.0 - Fixed a bug (#537) - Support for all wav type in browser. - Fixed a bug (#576) - Using ini_get() function to detect if apc is enabled or not. - Fixed invalid date time format in :doc:`Date helper <helpers/date_helper>` and :doc:`XMLRPC library <libraries/xmlrpc>`. +- Fixed a bug (#200) - MySQL queries would be malformed after calling count_all() then db->get(). Version 2.0.3 ============= |