Merge branch 'hotfix-41524' into develop

NETivism · Sep 3, 2024 · 248cf24 · 248cf24
2 parents 7636d17 + 11357f9
commit 248cf24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Mailing/BAO/Job.php b/CRM/Mailing/BAO/Job.php
@@ -608,7 +608,7 @@ public function deliverGroup(&$fields, &$mailing, &$mailer, &$job_date, &$attach
       }
 
       // refs #30289, for valid DKIM
-      if (empty(CRM_Core_Config::singleton()->enableDMARC) && empty($headers['Sender']) && !empty($mailer->_mailSetting['return_path'])) {
+      if (empty($headers['Sender']) && !empty($mailer->_mailSetting['return_path'])) {
         $headers['Sender'] = $mailer->_mailSetting['return_path'];
       }
 

diff --git a/CRM/Mailing/BAO/Transactional.php b/CRM/Mailing/BAO/Transactional.php
@@ -180,7 +180,7 @@ public static function send(&$params, $callback = NULL) {
         CRM_Core_Error::ignoreException();
 
         // refs #30289, for valid DKIM
-        if (empty(CRM_Core_Config::singleton()->enableDMARC) && empty($headers['Sender']) && !empty($mailer->_mailSetting['return_path'])) {
+        if (empty($headers['Sender']) && !empty($mailer->_mailSetting['return_path'])) {
           $headers['Sender'] = $mailer->_mailSetting['return_path'];
         }
 

diff --git a/CRM/Utils/Mail.php b/CRM/Utils/Mail.php
@@ -210,7 +210,7 @@ static function send(&$params, $callback = NULL) {
     CRM_Core_Error::ignoreException();
     if (is_object($mailer)) {
       // refs #30289, for valid DKIM
-      if (empty(CRM_Core_Config::singleton()->enableDMARC) && empty($headers['Sender']) && !empty($mailer->_mailSetting['return_path'])) {
+      if (empty($headers['Sender']) && !empty($mailer->_mailSetting['return_path'])) {
         $headers['Sender'] = $mailer->_mailSetting['return_path'];
         $headers['Return-Path'] = $mailer->_mailSetting['return_path'];
       }