| commit | 4e5ff1f7f8c1897526e9362fdcf7b574c1b3cdf9 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Wed Aug 05 14:32:03 2015 +0300 |
| committer | Andrey Andreev <narf@devilix.net> | Wed Aug 05 14:32:03 2015 +0300 |
| tree | d021b476c69ffe0881939f8d50c8cb4c1b0e6d2d | |
| parent | 3373598673d2d31ccd9c7e97e90a1ae196e97aae [diff] [blame] |
Fix #4026
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index e58496d..659664d 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php
@@ -647,7 +647,10 @@ } // 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();