dev/core/#133 Make Conditions Stricter When Checking If Reply-To Field Is Empty

dev/core/#133 Retain existing behaviour on update and only be aggressive on adding new

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 9e7c1ea53ab333ed4ea316f01393cfb779dfa59e..23a1a411f42f7813392248de8c3a7d27e482defb 100644 (file)
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -1452,7 +1452,7 @@ ORDER BY   civicrm_email.is_bulkmail DESC
     }
     $mailing->domain_id = CRM_Utils_Array::value('domain_id', $params, CRM_Core_Config::domainID());
 
-    if (!isset($params['replyto_email']) &&
+    if (((!$id && empty($params['replyto_email'])) || !isset($params['replyto_email'])) &&
       isset($params['from_email'])
     ) {
       $params['replyto_email'] = $params['from_email'];