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

Merged in bugfix/PMCORE-952-C (pull request #8218)

Browse Source 
PMCORE-952-C

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Andrea Adamczyk
2021-10-18 20:27:26 +00:00
committed by Julio Cesar Laura Avendaño
parent 7f2e2102aa 630cee56f7
commit baf99d7422
2 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
View File

@@ -354,8 +354,16 @@ class ActionsByEmail
$data[$index]['USER'] = '';
if ($data[$index]['ABE_MAILSERVER_OR_MAILCURRENT'] == 1) {
$emailServer = new EmailServer();
$dataEmailServer = $emailServer->getEmailServer($data[$index]['ABE_EMAIL_SERVER_UID']);
$data[$index]['USER'] = $dataEmailServer['MESS_FROM_NAME'];
if (!empty($data[$index]['ABE_EMAIL_SERVER_UID'])) {
$dataEmailServer = $emailServer->getEmailServer($data[$index]['ABE_EMAIL_SERVER_UID']);
} else {
$emailServerModel = new EmailServerModel();
$emailServerDefault = $emailServerModel->getEmailServerDefault();
if (isset($emailServerDefault['MESS_UID'])) {
$dataEmailServer = $emailServer->getEmailServer($emailServerDefault['MESS_UID']);
}
}
$data[$index]['USER'] = isset($dataEmailServer['MESS_FROM_NAME']) ? $dataEmailServer['MESS_FROM_NAME'] : '';
}
if ($data[$index]['ABE_MAILSERVER_OR_MAILCURRENT'] == 0) {
$delegation = new AppDelegation();