mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-09-08 10:59:03 +00:00
use name of sender even if force_from is set
This commit is contained in:
parent
5d083993df
commit
59f30a4a36
|
@ -103,7 +103,11 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
|
||||||
|
|
||||||
$returnpath = $this->from_address;
|
$returnpath = $this->from_address;
|
||||||
if($this->force_from && $this->from_address) {
|
if($this->force_from && $this->from_address) {
|
||||||
$from = $this->from_address;
|
if(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
|
||||||
|
$from = $sender->getFullName() ." <". $this->from_address .">";
|
||||||
|
} else {
|
||||||
|
$from = $this->from_address;
|
||||||
|
}
|
||||||
} elseif(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
|
} elseif(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
|
||||||
$from = $sender->getFullName() ." <". $sender->getEmail() .">";
|
$from = $sender->getFullName() ." <". $sender->getEmail() .">";
|
||||||
if(!$returnpath)
|
if(!$returnpath)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user