From 4d44e6853348f874c19bac3c707a41c142e4964b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Feb 2023 20:40:46 +0100 Subject: [PATCH] Fix substitution for emailing test --- htdocs/comm/mailing/card.php | 2 +- htdocs/core/class/html.formmail.class.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 06d72826101..1fec22ea979 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -323,7 +323,7 @@ if (empty($reshook)) { $newmessage = make_substitutions($message, $substitutionarray, null, 0); $moreinheader = ''; - if (preg_match('/__UNSUBSCRIBE__/', $message)) { + if (preg_match('/__UNSUBSCRIBE_(_|URL_)/', $message)) { $moreinheader = "List-Unsubscribe: <__UNSUBSCRIBE_URL__>\n"; $moreinheader = make_substitutions($moreinheader, $substitutionarray); } diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 96d6d4c0d89..e3a60fbf6ab 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1615,8 +1615,6 @@ class FormMail extends Form $tmparray['__OTHER3__'] = 'Other3'; $tmparray['__OTHER4__'] = 'Other4'; $tmparray['__OTHER5__'] = 'Other5'; - $tmparray['__CHECK_READ__'] = 'TagCheckMail'; - $tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe'; //,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing $onlinepaymentenabled = 0;