BUG 14273 Error al ejecutar los eventos con PMFSendMessage IMPROVEMENT
This commit is contained in:
committed by
Erik Amaru Ortiz
parent
30a498d607
commit
43d933aac6
@@ -973,7 +973,7 @@ class wsBase
|
|||||||
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields, false);
|
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields, false);
|
||||||
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
|
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
|
||||||
|
|
||||||
if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
|
if (!$hasEmailFrom || ($aSetup["MESS_ACCOUNT"] != '' && strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false)) {
|
||||||
if (trim($aSetup["MESS_ACCOUNT"]) != "") {
|
if (trim($aSetup["MESS_ACCOUNT"]) != "") {
|
||||||
$sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
|
$sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user