Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NFC] minor form cleanup. #16905

Merged
merged 1 commit into from
Mar 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CRM/Activity/Form/Task.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public function preProcess() {
* Common pre-process function.
*
* @param CRM_Core_Form $form
*
* @throws \CRM_Core_Exception
*/
public static function preProcessCommon(&$form) {
$form->_activityHolderIds = [];
Expand Down
11 changes: 3 additions & 8 deletions CRM/Activity/Form/Task/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,15 @@ 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.
*/
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);
}

Expand All @@ -56,7 +53,6 @@ public function preProcess() {
public function buildQuickForm() {
// Enable form element.
$this->assign('emailTask', TRUE);

CRM_Contact_Form_Task_EmailCommon::buildQuickForm($this);
}

Expand All @@ -73,8 +69,7 @@ public function postProcess() {
* @return array
*/
public function listTokens() {
$tokens = CRM_Core_SelectValues::contactTokens();
return $tokens;
return CRM_Core_SelectValues::contactTokens();
}

}