Merge pull request #16905 from eileenmcnaughton/acti

[NFC] minor form cleanup.
civicrm · Mar 26, 2020 · 9e1819d · 9e1819d
2 parents 53cd146 + 946d8b8
commit 9e1819d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
@@ -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 = [];

diff --git a/CRM/Activity/Form/Task/Email.php b/CRM/Activity/Form/Task/Email.php
@@ -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);
   }
 
@@ -56,7 +53,6 @@ public function preProcess() {
   public function buildQuickForm() {
     // Enable form element.
     $this->assign('emailTask', TRUE);
-
     CRM_Contact_Form_Task_EmailCommon::buildQuickForm($this);
   }
 
@@ -73,8 +69,7 @@ public function postProcess() {
    * @return array
    */
   public function listTokens() {
-    $tokens = CRM_Core_SelectValues::contactTokens();
-    return $tokens;
+    return CRM_Core_SelectValues::contactTokens();
   }
 
 }