diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index d85f44c29f5..c02a83497c0 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -460,10 +460,15 @@ if (empty($reshook)) { setEventMessages($mesg, null, 'mesgs'); } else { $langs->load("other"); - if ($mailfile->error) { + if (!empty($mailfile->error) || !empty($mailfile->errors)) { $mesg = ''; - $mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo); - $mesg .= '
'.$mailfile->error; + $mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($emailFrom), dol_escape_htmltag($emailTo)); + if (!empty($mailfile->error)) { + $mesg .= '
' . $mailfile->error; + } + if (!empty($mailfile->errors) && is_array($mailfile->errors)) { + $mesg .= '
' . implode('
', $mailfile->errors); + } setEventMessages($mesg, null, 'errors'); } else { setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');