diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e33fb3c67a6..9653e28227f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4434,14 +4434,17 @@ function dol_print_email($email, $contactid = 0, $socid = 0, $addlink = 0, $max } else { $newemail = ($withpicto ? img_picto($langs->trans("EMail") . ' : ' . $email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '') . $newemail; - include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; - $emailonly = CMailFile::getValidAddress($email, 2); - if ($showinvalid && !isValidEmail($emailonly)) { - $langs->load("errors"); - $newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $email)); - } elseif ($showinvalid && !isValidMailDomain($emailonly)) { - $langs->load("errors"); - $newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $emailonly)); + if ($showinvalid) { + include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $emailonly = CMailFile::getValidAddress($email, 2); + if (!isValidEmail($emailonly)) { + $langs->load("errors"); + $newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $email)); + } elseif (!isValidMailDomain($emailonly)) { + $langs->load("errors"); + $newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $emailonly)); + } } }