Unverified Commit 41e15616 authored by colemanw's avatar colemanw Committed by GitHub

Merge pull request #16914 from eileenmcnaughton/act2

Remove unused code
parents e735c4fd be901202
......@@ -62,14 +62,8 @@ class CRM_Contact_Form_Task_EmailCommon {
$fromEmailValues = CRM_Core_BAO_Email::getFromEmail();
$form->_noEmails = FALSE;
if (empty($fromEmailValues)) {
$form->_noEmails = TRUE;
}
$form->assign('noEmails', $form->_noEmails);
if ($bounce) {
if ($form->_noEmails) {
if (empty($fromEmailValues)) {
CRM_Core_Error::statusBounce(ts('Your user record does not have a valid email address and no from addresses have been configured.'));
}
}
......
......@@ -23,7 +23,7 @@
<tr class="crm-contactEmail-form-block-recipient">
<td class="label">{if $single eq false}{ts}Recipient(s){/ts}{else}{$form.to.label}{/if}</td>
<td>
{$form.to.html}{if $noEmails eq true}&nbsp;&nbsp;{$form.emailAddress.html}{/if}
{$form.to.html}
</td>
</tr>
<tr class="crm-contactEmail-form-block-cc_id" {if !$form.cc_id.value}style="display:none;"{/if}>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment