From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Wed, 13 Apr 2016 11:10:56 +0000 (+0530)
Subject: CRM-18364: Reply-To field depopulates when saving then continuing a draft mailing
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=70f43ffb44fecdf5252e28d1b4c9f418303308b0;p=civicrm-core.git

CRM-18364: Reply-To field depopulates when saving then continuing a draft mailing

add comment

fix syntax typo
---

diff --git a/ang/crmMailing/FromAddress.js b/ang/crmMailing/FromAddress.js
index 2718ea0aa1..aae6499f1c 100644
--- a/ang/crmMailing/FromAddress.js
+++ b/ang/crmMailing/FromAddress.js
@@ -18,7 +18,10 @@
           var addr = crmFromAddresses.getByLabel(newValue);
           mailing.from_name = addr.author;
           mailing.from_email = addr.email;
-          mailing.replyto_email = addr.email;
+          // CRM-18364: set replyTo as from_email only if custom replyTo is disabled in mail settings.
+          if (!CRM.crmMailing.enableReplyTo) {
+            mailing.replyto_email = crmFromAddresses.getByAuthorEmail(mailing.from_name, mailing.from_email, true).label;
+          }
         });
         // FIXME: Shouldn't we also be watching mailing.from_name and mailing.from_email?
       }