Commit 946d8b80 authored by eileen's avatar eileen

[NFC] minor form cleanup.

Most notably  fix calling a non-static method statically but also remove comment that
clearly came in by copy & paste,
parent afbf782a
......@@ -39,6 +39,8 @@ class CRM_Activity_Form_Task extends CRM_Core_Form_Task {
* Common pre-process function.
*
* @param CRM_Core_Form $form
*
* @throws \CRM_Core_Exception
*/
public static function preProcessCommon(&$form) {
$form->_activityHolderIds = [];
......
......@@ -35,7 +35,7 @@ class CRM_Activity_Form_Task_Email extends CRM_Activity_Form_Task {
*
* @var array
*/
public $_templates = NULL;
public $_templates;
/**
* Build all the data structures needed to build the form.
......@@ -43,10 +43,7 @@ class CRM_Activity_Form_Task_Email extends CRM_Activity_Form_Task {
public function preProcess() {
CRM_Contact_Form_Task_EmailCommon::preProcessFromAddress($this);
parent::preProcess();
// we have all the contribution ids, so now we get the contact ids
parent::setContactIDs();
$this->setContactIDs();
$this->assign('single', $this->_single);
}
......@@ -56,7 +53,6 @@ class CRM_Activity_Form_Task_Email extends CRM_Activity_Form_Task {
public function buildQuickForm() {
// Enable form element.
$this->assign('emailTask', TRUE);
CRM_Contact_Form_Task_EmailCommon::buildQuickForm($this);
}
......@@ -73,8 +69,7 @@ class CRM_Activity_Form_Task_Email extends CRM_Activity_Form_Task {
* @return array
*/
public function listTokens() {
$tokens = CRM_Core_SelectValues::contactTokens();
return $tokens;
return CRM_Core_SelectValues::contactTokens();
}
}
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