Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX|members substitution variable not substituted if empty

Browse Source 
Members substitution variables not substituted if empty for the __MEMBER_ ... variables, the variable is showed instead.
Change to display '' instead
This commit is contained in:
Bernard Saulme
2020-09-18 18:29:52 +02:00
committed by GitHub
parent 11bf662c38
commit d86f541b35
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6072,25 +6072,25 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
if (is_object($object) && $object->element == 'adherent' && $object->id > 0) if (is_object($object) && $object->element == 'adherent' && $object->id > 0)
{ {
$substitutionarray['__MEMBER_ID__'] = $object->id; $substitutionarray['__MEMBER_ID__'] = (isset($object->id) ? $object->id : '');
if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel(); if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
$substitutionarray['__MEMBER_FIRSTNAME__'] = $object->firstname; $substitutionarray['__MEMBER_FIRSTNAME__'] = (isset($object->firstname) ? $object->firstname : '');
$substitutionarray['__MEMBER_LASTNAME__'] = $object->lastname; $substitutionarray['__MEMBER_LASTNAME__'] = (isset($object->lastname) ? $object->lastname : '');
if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs); if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);
$substitutionarray['__MEMBER_COMPANY__'] = $object->societe; $substitutionarray['__MEMBER_COMPANY__'] = (isset($object->societe) ? $object->societe : '');
$substitutionarray['__MEMBER_ADDRESS__'] = $object->address; $substitutionarray['__MEMBER_ADDRESS__'] = (isset($object->address) ? $object->address : '');
$substitutionarray['__MEMBER_ZIP__'] = $object->zip; $substitutionarray['__MEMBER_ZIP__'] = (isset($object->zip) ? $object->zip : '');
$substitutionarray['__MEMBER_TOWN__'] = $object->town; $substitutionarray['__MEMBER_TOWN__'] = (isset($object->town) ? $object->town : '');
$substitutionarray['__MEMBER_COUNTRY__'] = $object->country; $substitutionarray['__MEMBER_COUNTRY__'] = (isset($object->country) ? $object->country : '');
$substitutionarray['__MEMBER_EMAIL__'] = $object->email; $substitutionarray['__MEMBER_EMAIL__'] = (isset($object->email) ? $object->email : '');
$substitutionarray['__MEMBER_BIRTH__'] = $birthday; $substitutionarray['__MEMBER_BIRTH__'] = (isset($birthday) ? $birthday : '');
$substitutionarray['__MEMBER_PHOTO__'] = $object->photo; $substitutionarray['__MEMBER_PHOTO__'] = (isset($object->photo) ? $object->photo : '');
$substitutionarray['__MEMBER_LOGIN__'] = $object->login; $substitutionarray['__MEMBER_LOGIN__'] = (isset($object->login) ? $object->login : '');
$substitutionarray['__MEMBER_PASSWORD__'] = $object->pass; $substitutionarray['__MEMBER_PASSWORD__'] = (isset($object->pass) ? $object->pass : '');
$substitutionarray['__MEMBER_PHONE__'] = $object->phone; $substitutionarray['__MEMBER_PHONE__'] = (isset($object->phone) ? $object->phone : '');
$substitutionarray['__MEMBER_PHONEPRO__'] = $object->phone_perso; $substitutionarray['__MEMBER_PHONEPRO__'] = (isset($object->phone_perso) ? $object->phone_perso : '');
$substitutionarray['__MEMBER_PHONEMOBILE__'] = $object->phone_mobile; $substitutionarray['__MEMBER_PHONEMOBILE__'] = (isset($object->phone_mobile) ? $object->phone_mobile : '');
$substitutionarray['__MEMBER_TYPE__'] = $object->type; $substitutionarray['__MEMBER_TYPE__'] = (isset($object->type) ? $object->type : '');
$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__'] = dol_print_date($object->first_subscription_date, 'dayrfc'); $substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__'] = dol_print_date($object->first_subscription_date, 'dayrfc');
$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = dol_print_date($object->first_subscription_date_start, 'dayrfc'); $substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = dol_print_date($object->first_subscription_date_start, 'dayrfc');
$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__'] = dol_print_date($object->first_subscription_date_end, 'dayrfc'); $substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__'] = dol_print_date($object->first_subscription_date_end, 'dayrfc');