fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-1641

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-17 16:27:32 -04:00
parent 78cd23b5c3
commit 96c2c8a077
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.processes.php
View File

@@ -4178,9 +4178,11 @@ class Processes
foreach ($arrayData as $value) { foreach ($arrayData as $value) {
unset($value['EMAIL_EVENT_FROM']); unset($value['EMAIL_EVENT_FROM']);
unset($value['EMAIL_SERVER_UID']);
if (!empty($arrayEmailServerDefault)) { if (!empty($arrayEmailServerDefault)) {
$value['EMAIL_EVENT_FROM'] = $arrayEmailServerDefault['MESS_ACCOUNT']; $value['EMAIL_EVENT_FROM'] = $arrayEmailServerDefault['MESS_ACCOUNT'];
$value['EMAIL_SERVER_UID'] = $arrayEmailServerDefault['MESS_UID'];
} }
$emailEventData = $emailEvent->save($processUid, $value); $emailEventData = $emailEvent->save($processUid, $value);

2
workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
View File

@@ -469,7 +469,7 @@ class EmailEvent
$emailTo = $email; $emailTo = $email;
} }
} }
if (!empty($emailTo) && $arrayData[3] != '') { if (!empty($emailTo)) {
$subject = $arrayData[5]; $subject = $arrayData[5];
$subject = \G::replaceDataField($arrayData[5], $arrayApplicationData['APP_DATA']); $subject = \G::replaceDataField($arrayData[5], $arrayApplicationData['APP_DATA']);
\PMFSendMessage($appUID, $configEmailData['MESS_ACCOUNT'], $emailTo, '', '', $subject, \PMFSendMessage($appUID, $configEmailData['MESS_ACCOUNT'], $emailTo, '', '', $subject,