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

Fix: Normalize option names

Browse Source
This commit is contained in:
Laurent Destailleur 2012-12-31 13:40:13 +01:00
parent f7a53eebfb
commit dbdc4e6ce8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/mails.php
View File

@ -40,7 +40,7 @@ $substitutionarrayfortest=array(
'__EMAIL__' => 'TESTEMail', '__EMAIL__' => 'TESTEMail',
'__LASTNAME__' => 'TESTLastname', '__LASTNAME__' => 'TESTLastname',
'__FIRSTNAME__' => 'TESTFirstname', '__FIRSTNAME__' => 'TESTFirstname',
'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIL_DO_NOT_USE_SIGN))?$user->signature:''), '__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
//'__PERSONALIZED__' => 'TESTPersonalized' // Hiden because not used yet //'__PERSONALIZED__' => 'TESTPersonalized' // Hiden because not used yet
); );
complete_substitutions_array($substitutionarrayfortest, $langs); complete_substitutions_array($substitutionarrayfortest, $langs);

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

@ -88,7 +88,7 @@ $object->substitutionarrayfortest=array(
'__OTHER3__' => 'TESTOther3', '__OTHER3__' => 'TESTOther3',
'__OTHER4__' => 'TESTOther4', '__OTHER4__' => 'TESTOther4',
'__OTHER5__' => 'TESTOther5', '__OTHER5__' => 'TESTOther5',
'__SIGNATURE__' => (($user->signature && empty($conf->global->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))

2
htdocs/contrat/services.php
View File

@ -213,7 +213,7 @@ if ($resql)
$productstatic->ref=$obj->pref; $productstatic->ref=$obj->pref;
print $productstatic->getNomUrl(1,'',20); print $productstatic->getNomUrl(1,'',20);
print $obj->label?' - '.dol_trunc($obj->label,16):''; print $obj->label?' - '.dol_trunc($obj->label,16):'';
if (! empty($obj->description) && ! empty($conf->global->PRODUIT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description); if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
} }
else else
{ {

2
htdocs/core/lib/functions.lib.php
View File

@ -3491,7 +3491,7 @@ function make_substitutions($chaine,$substitutionarray)
// Make substitition // Make substitition
foreach ($substitutionarray as $key => $value) foreach ($substitutionarray as $key => $value)
{ {
if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIL_DO_NOT_USE_SIGN))) $value=''; if ($key == '__SIGNATURE__' && (! empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value='';
$chaine=str_replace("$key","$value",$chaine); // We must keep the " to work when value is 123.5 for example $chaine=str_replace("$key","$value",$chaine); // We must keep the " to work when value is 123.5 for example
} }