espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.3.2'

Browse Source
This commit is contained in:
yuri
2017-01-10 16:05:03 +02:00
parent 720635d7a3 8969866aec
commit cb8b6654e7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Services/EmailTemplate.php
+7 -2
View File
@@ -193,10 +193,15 @@ class EmailTemplate extends Record
$value = implode(', ', $valueList);
$value = $this->getLanguage()->translateOption($value, $field, $entity->getEntityType());
} else {
if ($entity->fields[$field]['type'] == 'date') {
if (!isset($entity->fields[$field]['type'])) continue;
$attributeType = $entity->fields[$field]['type'];
if ($attributeType == 'date') {
$value = $this->getDateTime()->convertSystemDate($value);
} else if ($entity->fields[$field]['type'] == 'datetime') {
} else if ($attributeType == 'datetime') {
$value = $this->getDateTime()->convertSystemDateTime($value);
} else if ($attributeType == 'text') {
$value = nl2br($value);
}
}
if (is_string($value) || $value === null || is_scalar($value) || is_callable([$value, '__toString'])) {