projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17283 from agh1/stop-icon-png
[civicrm-core.git]
/
ang
/
crmMailing
/
FromAddress.js
diff --git
a/ang/crmMailing/FromAddress.js
b/ang/crmMailing/FromAddress.js
index 2718ea0aa10610d37a3a7725155e1bf6c5ebaed0..aae6499f1c33d0072906ba3ea3a9547533d244dd 100644
(file)
--- 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;
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?
}
});
// FIXME: Shouldn't we also be watching mailing.from_name and mailing.from_email?
}