diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-28 15:46:36 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-28 15:46:36 +0100 |
| commit | 0bb866e6e1c55a536a3029eaaf1913e46512a51a (patch) | |
| tree | 0900b1701cda6e627349a58a6adfd8b1a8e46140 /system | |
| parent | 6d0356b08fe6b6d1d24c9ab22183397836b9e898 (diff) | |
| parent | 65134ce0b594c378679c92c40fb835cf9ab5cdd0 (diff) | |
Merge pull request #716 from timw4mail/develop
Fixed syntax error in PDO driver.
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 5f63a3771..18a508b15 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -255,11 +255,7 @@ 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(); } |