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

Merge pull request #1935 from luisfernandosl/BUG-12439

Browse Source 
BUG 12439 "Actions by email: No manda la manda la notificacion" SOLVED
This commit is contained in:
julceslauhub
2013-07-29 09:52:57 -07:00
parent 2160c53224 611ed3447f
commit 54adedbfd6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/class.wsBase.php
View File

@@ -974,9 +974,14 @@ class wsBase
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
if (! $hasEmailFrom || strpos( $sFrom, $aSetup['MESS_ACCOUNT'] ) === false) {
$sFrom = '"' . stripslashes( $sFrom ) . '" <' . $aSetup['MESS_ACCOUNT'] . ">";
if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
if (trim($aSetup["MESS_ACCOUNT"]) != "") {
$sFrom = "\"" . stripslashes($sFrom) . "\" <" . $aSetup["MESS_ACCOUNT"] . ">";
} else {
$sFrom = "<info@" . $_SERVER["HTTP_HOST"] . ">";
}
}
$showMessage = ($showMessage) ? 1 : 0 ;
$messageArray = array(