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

Merge pull request #740 from FHenry/3.3

Browse Source 
Fix syntax error
This commit is contained in:
Laurent Destailleur 2013-03-13 08:52:25 -07:00
commit 6fc57fb90d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/mailing/fiche.php
View File

@ -63,8 +63,8 @@ $object->substitutionarray=array(
'__OTHER3__' => 'Other3', '__OTHER3__' => 'Other3',
'__OTHER4__' => 'Other4', '__OTHER4__' => 'Other4',
'__OTHER5__' => 'Other5', '__OTHER5__' => 'Other5',
'__SIGNATURE__' => 'TagSignature', '__SIGNATURE__' => 'TagSignature'
//'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet //,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet
); );
if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
{ {
@ -88,8 +88,8 @@ $object->substitutionarrayfortest=array(
'__OTHER3__' => 'TESTOther3', '__OTHER3__' => 'TESTOther3',
'__OTHER4__' => 'TESTOther4', '__OTHER4__' => 'TESTOther4',
'__OTHER5__' => 'TESTOther5', '__OTHER5__' => 'TESTOther5',
'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''), '__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'')
//'__PERSONALIZED__' => 'TESTPersonalized' // Not used yet //,'__PERSONALIZED__' => 'TESTPersonalized' // Not used yet
); );
if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) if (!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE))
{ {