Unverified Commit fdd3d3a0 authored by Seamus Lee's avatar Seamus Lee Committed by GitHub

Merge pull request #13207 from JMAConsulting/core-11

#11: Email - send now error screen should display earlier
parents a4e2c955 f5727fac
......@@ -131,7 +131,6 @@ class CRM_Contact_Form_Task_Email extends CRM_Contact_Form_Task {
if (!$cid && $this->_context != 'standalone') {
parent::preProcess();
}
CRM_Contact_Form_Task_EmailCommon::bounceIfSimpleMailLimitExceeded(count($this->_contactIds));
$this->assign('single', $this->_single);
if (CRM_Core_Permission::check('administer CiviCRM')) {
......
......@@ -124,6 +124,7 @@ class CRM_Contact_Form_Task_EmailCommon {
if (count($form->_contactIds) > 1) {
$form->_single = FALSE;
}
CRM_Contact_Form_Task_EmailCommon::bounceIfSimpleMailLimitExceeded(count($form->_contactIds));
$emailAttributes = array(
'class' => 'huge',
......
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