summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-09-25 18:50:43 +0200
committerAndrey Andreev <narf@devilix.net>2017-09-25 18:50:43 +0200
commit1db998348e8850db79c4afa2d057fa31fb6bc12c (patch)
tree5e334c1b82e8be12799b729a0234f8cc0f19bb74 /system/database/DB_driver.php
parent4b9d8f2fa62b62616d2d1043a6faa39d40989070 (diff)
parent4131d42c793c3db50b6184e5084332d5415c91cb (diff)
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r--system/database/DB_driver.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index e04525de3..54740c309 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -854,6 +854,7 @@ abstract class CI_DB_driver {
if ($this->_trans_begin())
{
+ $this->_trans_status = TRUE;
$this->_trans_depth++;
return TRUE;
}