Move generic instances of listTokens to trait

diff --git a/CRM/Activity/Form/Task/Email.php b/CRM/Activity/Form/Task/Email.php
index ccddab7aef7c04f15fd43a72561d61a6167d8e84..eb9a60e06ba89784990115ab47b415dc2352b870 100644 (file)
--- a/CRM/Activity/Form/Task/Email.php
+++ b/CRM/Activity/Form/Task/Email.php
@@ -21,13 +21,4 @@
 class CRM_Activity_Form_Task_Email extends CRM_Activity_Form_Task {
   use CRM_Contact_Form_Task_EmailTrait;
 
-  /**
-   * List available tokens for this form.
-   *
-   * @return array
-   */
-  public function listTokens() {
-    return CRM_Core_SelectValues::contactTokens();
-  }
-
 }

diff --git a/CRM/Contact/Form/Task/Email.php b/CRM/Contact/Form/Task/Email.php
index afd39cd3a3c4c4d7d20982e532c9e046fda2ab4c..81b824469876ca902eca281ef3ac35ad3a5d67cb 100644 (file)
--- a/CRM/Contact/Form/Task/Email.php
+++ b/CRM/Contact/Form/Task/Email.php
@@ -80,6 +80,7 @@ class CRM_Contact_Form_Task_Email extends CRM_Contact_Form_Task {
    * List available tokens for this form.
    *
    * @return array
+   * @throws \CRM_Core_Exception
    */
   public function listTokens() {
     $tokens = CRM_Core_SelectValues::contactTokens();

diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php
index 02602753dd38673f907acc39fda0c2dba0d1bb25..c2347c52c0e48490a3d5e792b02ea28a006c05e5 100644 (file)
--- a/CRM/Contact/Form/Task/EmailTrait.php
+++ b/CRM/Contact/Form/Task/EmailTrait.php
@@ -105,4 +105,13 @@ trait CRM_Contact_Form_Task_EmailTrait {
     CRM_Contact_Form_Task_EmailCommon::postProcess($this);
   }
 
+  /**
+   * List available tokens for this form.
+   *
+   * @return array
+   */
+  public function listTokens() {
+    return CRM_Core_SelectValues::contactTokens();
+  }
+
 }

diff --git a/CRM/Event/Form/Task/Email.php b/CRM/Event/Form/Task/Email.php
index e771571054a3170fcf24a1c554f667237ca38174..cd0270b3764bd661b2121f02695f271322cec0ab 100644 (file)
--- a/CRM/Event/Form/Task/Email.php
+++ b/CRM/Event/Form/Task/Email.php
@@ -22,14 +22,4 @@
 class CRM_Event_Form_Task_Email extends CRM_Event_Form_Task {
   use CRM_Contact_Form_Task_EmailTrait;
 
-  /**
-   * List available tokens for this form.
-   *
-   * @return array
-   */
-  public function listTokens() {
-    $tokens = CRM_Core_SelectValues::contactTokens();
-    return $tokens;
-  }
-
 }

diff --git a/CRM/Member/Form/Task/Email.php b/CRM/Member/Form/Task/Email.php
index 8db66116e1ad23ba1c8cbf22ec82cdd48a4b8eb5..5e0e6d4baa61941ac9092f1cad8a107fe7d10e07 100644 (file)
--- a/CRM/Member/Form/Task/Email.php
+++ b/CRM/Member/Form/Task/Email.php
@@ -22,14 +22,4 @@
 class CRM_Member_Form_Task_Email extends CRM_Member_Form_Task {
   use CRM_Contact_Form_Task_EmailTrait;
 
-  /**
-   * List available tokens for this form.
-   *
-   * @return array
-   */
-  public function listTokens() {
-    $tokens = CRM_Core_SelectValues::contactTokens();
-    return $tokens;
-  }
-
 }