diff --git a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php index 93bed89bc2..899e2018f6 100644 --- a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php @@ -37,6 +37,7 @@ use Espo\Core\{ ORM\EntityManager, }; +use Espo\Entities\Email; use Espo\Entities\User; class StringDataLoader implements Loader @@ -69,7 +70,7 @@ class StringDataLoader implements Loader if ( in_array($entity->get('fromEmailAddressId'), $userEmailAdddressIdList) || - $entity->get('createdById') === $this->user->getId() + $entity->get('createdById') === $this->user->getId() && $entity->get('status') === Email::STATUS_SENT ) { $entity->loadLinkMultipleField('toEmailAddresses'); diff --git a/application/Espo/Entities/Email.php b/application/Espo/Entities/Email.php index cc9d005579..f78fc89a2a 100644 --- a/application/Espo/Entities/Email.php +++ b/application/Espo/Entities/Email.php @@ -83,7 +83,13 @@ class Email extends Entity return null; } - return EmailService::parseFromName($this->get('fromString')); + $string = EmailService::parseFromName($this->get('fromString')); + + if ($string === '') { + return null; + } + + return $string; } protected function _getFromAddress()