diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index a3df6705df9..c9a8eebf0fe 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -634,6 +634,12 @@ if (empty($reshook)) $msg = $arraydefaultmessage->content; } + if (empty($labeltouse)) { + //fallback on the old configuration. + $subject = $conf->global->ADHERENT_MAIL_VALID_SUBJECT; + $msg = $conf->global->ADHERENT_MAIL_VALID; + } + $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object); complete_substitutions_array($substitutionarray, $outputlangs, $object); $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs); @@ -707,6 +713,12 @@ if (empty($reshook)) $msg = $arraydefaultmessage->content; } + if (empty($labeltouse)) { + //fallback on the old configuration. + $subject = $conf->global->ADHERENT_MAIL_RESIL_SUBJECT; + $msg = $conf->global->ADHERENT_MAIL_RESIL; + } + $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object); complete_substitutions_array($substitutionarray, $outputlangs, $object); $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);