Index: branches/5.3.x/core/kernel/utility/email_send.php =================================================================== diff -u -N -r15928 -r15944 --- branches/5.3.x/core/kernel/utility/email_send.php (.../email_send.php) (revision 15928) +++ branches/5.3.x/core/kernel/utility/email_send.php (.../email_send.php) (revision 15944) @@ -1,6 +1,6 @@ _logData ) { + $this->_logData['Status'] = EmailLogStatus::ERROR; + $this->_logData['ErrorMessage'] = $error_msg; + $this->Conn->doInsert($this->_logData, TABLE_PREFIX . 'EmailLog'); } else { - if ( $this->Application->isDebugMode() ) { - $this->Application->Debugger->appendTrace(); + if ($fatal) { + throw new Exception($error_msg); } + else { + if ( $this->Application->isDebugMode() ) { + $this->Application->Debugger->appendTrace(); + } - trigger_error($error_msg, E_USER_WARNING); + trigger_error($error_msg, E_USER_WARNING); + } } return false;