diff options
| author | Repox <storm@err0r.dk> | 2011-11-23 09:44:54 +0100 |
|---|---|---|
| committer | Repox <storm@err0r.dk> | 2011-11-23 09:44:54 +0100 |
| commit | e45f28c5ab7509ade2a9db0cd574d8a688bc4c3b (patch) | |
| tree | 81a8720574945f47edb0617842c331c6e1f476a1 /system/database/drivers/pdo | |
| parent | 1f9a40f2465ee135d4ed0292d51a1ed6571173f0 (diff) | |
| parent | b25bf9db4af963269362e16cec0a99326c4439ad (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/pdo')
| -rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index a66a16e90..5f63a3771 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -255,7 +255,11 @@ class CI_DB_pdo_driver extends CI_DB { // Reset the transaction failure flag. // If the $test_mode flag is set to TRUE transactions will be rolled back // even if the queries produce a successful result. +<<<<<<< HEAD $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; +======= + $this->_trans_failure = (bool) ($test_mode === TRUE); +>>>>>>> master return $this->conn_id->beginTransaction(); } |