From b55e8de3209d43b37cdbf3fc2ee88f8deb8ef233 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Nov 2023 10:55:25 +0100 Subject: [PATCH] Removed a deprecated substitution tag --- htdocs/admin/mails_ticket.php | 1 - htdocs/core/class/html.formmail.class.php | 1 - htdocs/core/tpl/card_presend.tpl.php | 1 - htdocs/core/tpl/massactions_pre.tpl.php | 1 - 4 files changed, 4 deletions(-) diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php index ec995efa804..9df2ea2f37b 100644 --- a/htdocs/admin/mails_ticket.php +++ b/htdocs/admin/mails_ticket.php @@ -53,7 +53,6 @@ $substitutionarrayfortest = array( '__COUNTRY__'=> 'RecipientCountry', '__USER_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), '__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails - //'__PERSONALIZED__' => 'TESTPersonalized' // Hiden because not used yet ); complete_substitutions_array($substitutionarrayfortest, $langs); diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 443f85c3fd7..c7fce0b43dc 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1709,7 +1709,6 @@ class FormMail extends Form $tmparray['__OTHER3__'] = 'Other3'; $tmparray['__OTHER4__'] = 'Other4'; $tmparray['__OTHER5__'] = 'Other5'; - //,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing $onlinepaymentenabled = 0; if (isModEnabled('paypal')) { diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 59c7529c520..fbce28c2086 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -277,7 +277,6 @@ if ($action == 'presend') { $checkRead.='" width="1" height="1" style="width:1px;height:1px" border="0"/>'; $substitutionarray['__CHECK_READ__'] = $checkRead; } - $substitutionarray['__PERSONALIZED__'] = ''; // deprecated $substitutionarray['__CONTACTCIVNAME__'] = ''; $parameters = array( 'mode' => 'formemail' diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php index b652b793edc..871a0b48067 100644 --- a/htdocs/core/tpl/massactions_pre.tpl.php +++ b/htdocs/core/tpl/massactions_pre.tpl.php @@ -282,7 +282,6 @@ if ($massaction == 'presend') { $substitutionarray['__EMAIL__'] = $sendto; $substitutionarray['__CHECK_READ__'] = ''; - $substitutionarray['__CONTACTCIVNAME__'] = ''; $substitutionarray['__ONLINE_PAYMENT_URL__'] = 'UrlToPayOnlineIfApplicable'; $substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = 'TextAndUrlToPayOnlineIfApplicable'; $substitutionarray['__THIRDPARTY_NAME__'] = '__THIRDPARTY_NAME__';