summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-08-05 13:32:03 +0200
committerAndrey Andreev <narf@devilix.net>2015-08-05 13:32:03 +0200
commit4e5ff1f7f8c1897526e9362fdcf7b574c1b3cdf9 (patch)
treed021b476c69ffe0881939f8d50c8cb4c1b0e6d2d /system/database
parent3373598673d2d31ccd9c7e97e90a1ae196e97aae (diff)
Fix #4026
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index e58496de9..659664db9 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -647,7 +647,10 @@ abstract class CI_DB_driver {
}
// This will trigger a rollback if transactions are being used
- $this->_trans_status = FALSE;
+ if ($this->_trans_depth !== 0)
+ {
+ $this->_trans_status = FALSE;
+ }
// Grab the error now, as we might run some additional queries before displaying the error
$error = $this->error();