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

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

View File

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