lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix substitution for emailing test

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-23 20:40:46 +01:00
parent 025d498f51
commit 4d44e68533
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/mailing/card.php
View File

@ -323,7 +323,7 @@ if (empty($reshook)) {
$newmessage = make_substitutions($message, $substitutionarray, null, 0); $newmessage = make_substitutions($message, $substitutionarray, null, 0);
$moreinheader = ''; $moreinheader = '';
if (preg_match('/__UNSUBSCRIBE__/', $message)) { if (preg_match('/__UNSUBSCRIBE_(_|URL_)/', $message)) {
$moreinheader = "List-Unsubscribe: <__UNSUBSCRIBE_URL__>\n"; $moreinheader = "List-Unsubscribe: <__UNSUBSCRIBE_URL__>\n";
$moreinheader = make_substitutions($moreinheader, $substitutionarray); $moreinheader = make_substitutions($moreinheader, $substitutionarray);
} }

2
htdocs/core/class/html.formmail.class.php
View File

@ -1615,8 +1615,6 @@ class FormMail extends Form
$tmparray['__OTHER3__'] = 'Other3'; $tmparray['__OTHER3__'] = 'Other3';
$tmparray['__OTHER4__'] = 'Other4'; $tmparray['__OTHER4__'] = 'Other4';
$tmparray['__OTHER5__'] = 'Other5'; $tmparray['__OTHER5__'] = 'Other5';
$tmparray['__CHECK_READ__'] = 'TagCheckMail';
$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
//,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing //,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing
$onlinepaymentenabled = 0; $onlinepaymentenabled = 0;