summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-04-04 12:57:12 +0200
committerAndrey Andreev <narf@bofh.bg>2013-04-04 12:57:12 +0200
commitea4ea94ef615458f2f786397a84a7c0e0d5876ee (patch)
treeda317a660255e85fbd09a578df906a541f046d36 /system/database
parent50cc2be4e653cbaf84fb6324c4b9876bd896cca3 (diff)
parentfa99dc6e81cecfca434ba5b94d9f59647aa721c6 (diff)
Merge pull request #2343 from QOX/develop
Fixed problem for transaction test mode.
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 97021f125..9239dc154 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -816,7 +816,7 @@ abstract class CI_DB_driver {
}
// The query() function will set this flag to FALSE in the event that a query failed
- if ($this->_trans_status === FALSE)
+ if ($this->_trans_status === FALSE OR $this->_trans_failure === TRUE)
{
$this->trans_rollback();