Fix #4026

bcit-ci · Aug 5, 2015 · 4e5ff1f · 4e5ff1f
1 parent 3373598
commit 4e5ff1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
@@ -647,7 +647,10 @@ public function query($sql, $binds = FALSE, $return_object = NULL)
 			}
 
 			// This will trigger a rollback if transactions are being used
-			$this->_trans_status = FALSE;
+			if ($this->_trans_depth !== 0)
+			{
+				$this->_trans_status = FALSE;
+			}
 
 			// Grab the error now, as we might run some additional queries before displaying the error
 			$error = $this->error();

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -77,6 +77,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#4012) - :doc:`Query Builder <database/query_builder>` methods ``where_in()``, ``or_where_in()``, ``where_not_in()``, ``or_where_not_in()`` didn't take into account previously cached WHERE conditions when query cache is in use.
 -  Fixed a bug (#4015) - :doc:`Email Library <libraries/email>` method ``set_header()`` didn't support method chaining, although it was advertised.
 -  Fixed a bug (#4027) - :doc:`Routing <general/routing>` with HTTP verbs only worked if the route request method was declared in all-lowercase letters.
+-  Fixed a bug (#4026) - :doc:`Database Transactions <database/transactions>` always rollback if any previous ``query()`` call fails.
 
 Version 3.0.0
 =============