summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-11-23 10:58:02 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-11-23 10:58:02 +0100
commitc72e172f158747b75ee524b46f5819c4bf3d0eaa (patch)
treef24eee345160ecbb6f898c49e396c486dd518411
parentb25bf9db4af963269362e16cec0a99326c4439ad (diff)
parent66970cbc04f46072452b60a375c17610ae62b599 (diff)
Merge pull request #691 from jerkob/develop
Updated trans_start() and trans_complete() so _trans_depth increments.
-rw-r--r--system/database/DB_driver.php5
-rw-r--r--user_guide_src/source/changelog.rst1
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