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

Merged in bugfix/HOR-4611 (pull request #6501)

Browse Source 
HOR-4611

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2018-06-06 17:49:34 +00:00
committed by Julio Cesar Laura Avendaño
parent e644118682 9f6bd76633
commit 981fa17a36
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,12 +107,15 @@ class EmailEvent
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
$emailServer = new EmailServer(); $emailServer = new EmailServer();
if ($row) { if ($row) {
$emailServerData = $emailServer->getEmailServer($row['EMAIL_SERVER_UID'], true); $row['MESS_LABEL'] = "";
$row['MESS_LABEL'] = EmailServer::getMessLabel( if (!empty($row['EMAIL_SERVER_UID'])) {
$emailServerData['MESS_ENGINE'], $emailServerData = $emailServer->getEmailServer($row['EMAIL_SERVER_UID'], true);
$emailServerData['MESS_ACCOUNT'], $row['MESS_LABEL'] = EmailServer::getMessLabel(
$emailServerData['MESS_FROM_MAIL'] $emailServerData['MESS_ENGINE'],
); $emailServerData['MESS_ACCOUNT'],
$emailServerData['MESS_FROM_MAIL']
);
}
$row = array_change_key_case($row, CASE_LOWER); $row = array_change_key_case($row, CASE_LOWER);
} }
return $row; return $row;