summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorDionysis Arvanitis <dionysis.arvanitis@gmail.com>2013-02-19 22:11:34 +0100
committerDionysis Arvanitis <dionysis.arvanitis@gmail.com>2013-02-19 22:11:34 +0100
commit635ced168ce1ce7a91cfef782a1a3c37789f8930 (patch)
tree99256cb3385a56b3e2a36bc2469b2742351f32f9 /system/database
parenta1ff8b3c0ed9d5315cd4c22e5878d057204d9378 (diff)
DB_driver's trans_complete exception fix
Diffstat (limited to 'system/database')
-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 35ac8e870..05abd864b 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));