From 7a7019fb00d4c58a1acdf148a3a3c5834cf09fd0 Mon Sep 17 00:00:00 2001 From: Jitendra Purohit Date: Tue, 31 Jul 2018 16:55:05 +0530 Subject: [PATCH] dev/core#295 - Allow default 'from' email to be set in New email form --- CRM/Contact/Form/Task/EmailCommon.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php index 3f12ee333a..889adc25ab 100644 --- a/CRM/Contact/Form/Task/EmailCommon.php +++ b/CRM/Contact/Form/Task/EmailCommon.php @@ -89,7 +89,11 @@ class CRM_Contact_Form_Task_EmailCommon { } $form->_emails = $fromEmailValues; + $defaults = array(); $form->_fromEmails = $fromEmailValues; + if (!Civi::settings()->get('allow_mail_from_logged_in_contact')) { + $defaults['from_email_address'] = current(CRM_Core_BAO_Domain::getNameAndEmail(FALSE, TRUE)); + } if (is_numeric(key($form->_fromEmails))) { // Add signature $defaultEmail = civicrm_api3('email', 'getsingle', array('id' => key($form->_fromEmails))); @@ -100,8 +104,8 @@ class CRM_Contact_Form_Task_EmailCommon { if (!empty($defaultEmail['signature_text'])) { $defaults['text_message'] = "\n\n--\n" . $defaultEmail['signature_text']; } - $form->setDefaults($defaults); } + $form->setDefaults($defaults); } /** -- 2.25.1