diff --git a/CRM/Mailing/Event/BAO/Confirm.php b/CRM/Mailing/Event/BAO/Confirm.php index 5ac6641fe30c..15f16ab6eb9b 100644 --- a/CRM/Mailing/Event/BAO/Confirm.php +++ b/CRM/Mailing/Event/BAO/Confirm.php @@ -87,7 +87,7 @@ public static function confirm($contact_id, $subscribe_id, $hash) { $config = CRM_Core_Config::singleton(); $domain = CRM_Core_BAO_Domain::getDomain(); - list($domainEmailName, $_) = CRM_Core_BAO_Domain::getNameAndEmail(); + list($domainEmailName, $domainEmailAddress) = CRM_Core_BAO_Domain::getNameAndEmail(); list($display_name, $email) = CRM_Contact_BAO_Contact_Location::getEmailDetails($se->contact_id); @@ -125,7 +125,7 @@ public static function confirm($contact_id, $subscribe_id, $hash) { $mailParams = [ 'groupName' => 'Mailing Event ' . $component->component_type, 'subject' => $component->subject, - 'from' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', + 'from' => "\"{$domainEmailName}\" <{$domainEmailAddress}>", 'toEmail' => $email, 'toName' => $display_name, 'replyTo' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), diff --git a/CRM/Mailing/Event/BAO/Reply.php b/CRM/Mailing/Event/BAO/Reply.php index ed240b720f23..d618b2014370 100644 --- a/CRM/Mailing/Event/BAO/Reply.php +++ b/CRM/Mailing/Event/BAO/Reply.php @@ -228,12 +228,12 @@ private static function autoRespond(&$mailing, $queue_id, $replyto) { $component->find(TRUE); $domain = CRM_Core_BAO_Domain::getDomain(); - list($domainEmailName, $_) = CRM_Core_BAO_Domain::getNameAndEmail(); + list($domainEmailName, $domainEmailAddress) = CRM_Core_BAO_Domain::getNameAndEmail(); $params = [ 'subject' => $component->subject, 'toEmail' => $to, - 'from' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', + 'from' => "\"{$domainEmailName}\" <{$domainEmailAddress}>", 'replyTo' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), 'returnPath' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), ]; diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php index 3468c533b17b..73e15ec35daf 100644 --- a/CRM/Mailing/Event/BAO/Resubscribe.php +++ b/CRM/Mailing/Event/BAO/Resubscribe.php @@ -249,7 +249,7 @@ public static function send_resub_response($queue_id, $groups, $is_domain = FALS $params = [ 'subject' => $component->subject, - 'from' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', + 'from' => "\"{$domainEmailName}\" <{$domainEmailAddress}>", 'toEmail' => $eq->email, 'replyTo' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), 'returnPath' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php index ab41f47712f5..ec9f8a53c819 100644 --- a/CRM/Mailing/Event/BAO/Unsubscribe.php +++ b/CRM/Mailing/Event/BAO/Unsubscribe.php @@ -384,7 +384,7 @@ public static function send_unsub_response($queue_id, $groups, $is_domain, $job) $params = [ 'subject' => $component->subject, - 'from' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', + 'from' => "\"{$domainEmailName}\" <{$domainEmailAddress}>", 'toEmail' => $eq->email, 'replyTo' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), 'returnPath' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(),