diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-22 16:25:32 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-22 16:25:32 +0100 |
| commit | c00a5a042341b8fe10d264ed1ea70177bc5e572d (patch) | |
| tree | 88be90e02c41de95868152b8f3107d03b0b53fb8 /system/database/drivers/pdo | |
| parent | c737c94b6dd2044b7c1a7d506c57de7da6df97f4 (diff) | |
| parent | 0199f68db46d375af2d4cb831c679d3040601f25 (diff) | |
Merge master (2.1.0) and fixed conflicts.
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(); } |