Merge pull request #4369 from galdiolo/patch-12

Optimize transactions check in CI_DB_driver::query()

1 files changed, 6 insertions, 10 deletions

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index af6b9f399..59662a946 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -641,19 +641,15 @@ abstract class CI_DB_driver {
 				// if transactions are enabled. If we don't call this here
 				// the error message will trigger an exit, causing the
 				// transactions to remain in limbo.
-				if ($this->_trans_depth !== 0)
+				while ($this->_trans_depth !== 0)
 				{
-					do
+					$trans_depth = $this->_trans_depth;
+					$this->trans_complete();
+					if ($trans_depth === $this->_trans_depth)
 					{
-						$trans_depth = $this->_trans_depth;
-						$this->trans_complete();
-						if ($trans_depth === $this->_trans_depth)
-						{
-							log_message('error', 'Database: Failure during an automated transaction commit/rollback!');
-							break;
-						}
+						log_message('error', 'Database: Failure during an automated transaction commit/rollback!');
+						break;
 					}
-					while ($this->_trans_depth !== 0);
 				}
 
 				// Display errors