Merge pull request #2266 from dionysiosarvanitis/fix/trans_complete

DB_driver's trans_complete exception fix

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));