diff options
| author | Darren Hill <dchill42@gmail.com> | 2011-08-31 20:13:02 +0200 |
|---|---|---|
| committer | Darren Hill <dchill42@gmail.com> | 2011-08-31 20:13:02 +0200 |
| commit | 054be5beba0b80b861ac170513bd94d73a478663 (patch) | |
| tree | d4f55e5133f6cb787b0f7f2bab68d16e513eee1c /system/database | |
| parent | 4d1cd4c56697bc53b5a9899089ab4c978c66e1da (diff) | |
| parent | d369077ac6cae25fa51c9840a466e54333300d0a (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_driver.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index f3e824daa..300ca2977 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -251,9 +251,10 @@ class CI_DB_driver { { if ($sql == '') { + log_message('error', 'Invalid query: '.$sql); + if ($this->db_debug) { - log_message('error', 'Invalid query: '.$sql); return $this->display_error('db_invalid_query'); } return FALSE; @@ -306,21 +307,23 @@ class CI_DB_driver { // This will trigger a rollback if transactions are being used $this->_trans_status = FALSE; + // 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(); + + // Log errors + log_message('error', 'Query error: '.$error_msg); + 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: '.$error_msg); + // Display errors return $this->display_error( array( 'Error Number: '.$error_no, |