From f38fe09dfecde176dc2803dd6a55177666f7d616 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 13 May 2008 20:28:11 +0000 Subject: hotfix for a bug in database error display introduced by 1.6.2 fix for bugs #4451, #4299, and #4339 --- system/database/DB_driver.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'system') diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 306f09d7d..a0833d0ce 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -308,18 +308,23 @@ class CI_DB_driver { if ($this->db_debug) { + // grab the error number and message now, as we might run some + // additional queries before displaying the error + $error_no = $this->_error_number(); + $error_msg = $this->_error_message(); + // We call this function in order to roll-back queries // 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. $this->trans_complete(); - + // Log and display errors log_message('error', 'Query error: '.$this->_error_message()); return $this->display_error( array( - 'Error Number: '.$this->_error_number(), - $this->_error_message(), + 'Error Number: '.$error_no, + $error_msg, $sql ) ); -- cgit v1.2.3-24-g4f1b