diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-02-08 17:29:52 +0100 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-02-08 17:29:52 +0100 |
| commit | ed520408514fff6486788e1543589418d24d885e (patch) | |
| tree | 07fd3194e9c6baf7aeaa9ccdd164e3fec4494922 /system/database/DB_driver.php | |
| parent | e5454f9b28f123a5549971f580255a065b2f8cc2 (diff) | |
| parent | 266c93cc505ae9a8cafb41f9d9432b056de492e0 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/database/DB_driver.php')
| -rw-r--r-- | system/database/DB_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index a0803f170..bbe65b410 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -822,7 +822,7 @@ abstract class CI_DB_driver { { if ( ! $this->trans_enabled) { - return FALSE; + return; } // When transactions are nested we only begin/commit/rollback the outermost ones |