diff options
| author | Repox <storm@err0r.dk> | 2011-11-24 09:14:04 +0100 |
|---|---|---|
| committer | Repox <storm@err0r.dk> | 2011-11-24 09:14:04 +0100 |
| commit | 5fb9a59e6d485ebdbc03fb4bb4f7fb2115246e3a (patch) | |
| tree | 3c3d32df2e7d461a425d509be96c082c061f6711 | |
| parent | e45f28c5ab7509ade2a9db0cd574d8a688bc4c3b (diff) | |
| parent | c72e172f158747b75ee524b46f5819c4bf3d0eaa (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
| -rw-r--r-- | system/database/DB_driver.php | 5 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index dd1b5677a..cc40ba48a 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -522,6 +522,7 @@ class CI_DB_driver { } $this->trans_begin($test_mode); + $this->_trans_depth += 1; } // -------------------------------------------------------------------- @@ -545,6 +546,10 @@ class CI_DB_driver { $this->_trans_depth -= 1; return TRUE; } + else + { + $this->_trans_depth = 0; + } // The query() function will set this flag to FALSE in the event that a query failed if ($this->_trans_status === FALSE) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index de2b3664b..b9ca39cee 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -57,6 +57,7 @@ Bug fixes for 3.0 - Unlink raised an error if cache file did not exist when you try to delete it. - Fixed a bug (#181) where a mis-spelling was in the form validation language file. +- Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented. Version 2.1.0 |