Fix: wrong var name and multi-line function call not indented correctly
This commit is contained in:
parent
ca8acdd5f0
commit
533d862470
@ -45,17 +45,17 @@ $object=new Mailing($db);
|
|||||||
|
|
||||||
// Tableau des substitutions possibles
|
// Tableau des substitutions possibles
|
||||||
$substitutionarray=array(
|
$substitutionarray=array(
|
||||||
'__ID__' => 'IdRecord',
|
'__ID__' => 'IdRecord',
|
||||||
'__EMAIL__' => 'EMail',
|
'__EMAIL__' => 'EMail',
|
||||||
'__LASTNAME__' => 'Lastname',
|
'__LASTNAME__' => 'Lastname',
|
||||||
'__FIRSTNAME__' => 'Firstname',
|
'__FIRSTNAME__' => 'Firstname',
|
||||||
'__OTHER1__' => 'Other1',
|
'__OTHER1__' => 'Other1',
|
||||||
'__OTHER2__' => 'Other2',
|
'__OTHER2__' => 'Other2',
|
||||||
'__OTHER3__' => 'Other3',
|
'__OTHER3__' => 'Other3',
|
||||||
'__OTHER4__' => 'Other4',
|
'__OTHER4__' => 'Other4',
|
||||||
'__OTHER5__' => 'Other5',
|
'__OTHER5__' => 'Other5',
|
||||||
'__SIGNATURE__' => 'Signature',
|
'__SIGNATURE__' => 'Signature',
|
||||||
'__PERSONALIZED__' => 'Personalized'
|
'__PERSONALIZED__' => 'Personalized'
|
||||||
);
|
);
|
||||||
if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
|
if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
|
||||||
{
|
{
|
||||||
@ -69,22 +69,22 @@ if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
|
|||||||
}
|
}
|
||||||
|
|
||||||
$substitutionarrayfortest=array(
|
$substitutionarrayfortest=array(
|
||||||
'__ID__' => 'TESTIdRecord',
|
'__ID__' => 'TESTIdRecord',
|
||||||
'__EMAIL__' => 'TESTEMail',
|
'__EMAIL__' => 'TESTEMail',
|
||||||
'__LASTNAME__' => 'TESTLastname',
|
'__LASTNAME__' => 'TESTLastname',
|
||||||
'__FIRSTNAME__' => 'TESTFirstname',
|
'__FIRSTNAME__' => 'TESTFirstname',
|
||||||
'__OTHER1__' => 'TESTOther1',
|
'__OTHER1__' => 'TESTOther1',
|
||||||
'__OTHER2__' => 'TESTOther2',
|
'__OTHER2__' => 'TESTOther2',
|
||||||
'__OTHER3__' => 'TESTOther3',
|
'__OTHER3__' => 'TESTOther3',
|
||||||
'__OTHER4__' => 'TESTOther4',
|
'__OTHER4__' => 'TESTOther4',
|
||||||
'__OTHER5__' => 'TESTOther5',
|
'__OTHER5__' => 'TESTOther5',
|
||||||
'__SIGNATURE__' => 'TESTSignature',
|
'__SIGNATURE__' => 'TESTSignature',
|
||||||
'__PERSONALIZED__' => 'TESTPersonalized'
|
'__PERSONALIZED__' => 'TESTPersonalized'
|
||||||
);
|
);
|
||||||
if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
|
if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
|
||||||
{
|
{
|
||||||
$substitutionarray=array_merge(
|
$substitutionarrayfortest=array_merge(
|
||||||
$substitutionarray,
|
$substitutionarrayfortest,
|
||||||
array(
|
array(
|
||||||
'__CHECK_READ__' => 'TESTCheckMail',
|
'__CHECK_READ__' => 'TESTCheckMail',
|
||||||
'__UNSUSCRIBE__' => 'TESTCheckMail'
|
'__UNSUSCRIBE__' => 'TESTCheckMail'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user