summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-21 17:24:16 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-21 17:24:16 +0100
commit2ba7e238975fa812ea19206ac5bef46d91f698fe (patch)
tree4d2486d9239b99db2fa1d2b1de48244c7d2c4eca
parent8cf596b5eabe431572ec1c4f21b9c32101feb22f (diff)
parent635ced168ce1ce7a91cfef782a1a3c37789f8930 (diff)
Merge pull request #2266 from dionysiosarvanitis/fix/trans_complete
DB_driver's trans_complete exception fix
-rw-r--r--system/database/DB_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index f03f56c85..ed0296d76 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -625,7 +625,7 @@ abstract class CI_DB_driver {
// if transactions are enabled. If we don't call this here
// the error message will trigger an exit, causing the
// transactions to remain in limbo.
- $this->trans_complete();
+ $this->_trans_depth > 0 && $this->trans_complete();
// Display errors
return $this->display_error(array('Error Number: '.$error['code'], $error['message'], $sql));