Merge pull request #16940 from eileenmcnaughton/email4

[REF] Move properties to Trait
civicrm · Apr 1, 2020 · f0ae535 · f0ae535
2 parents c10b06c + 362e6a6
commit f0ae535
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/CRM/Contact/Form/Task/Email.php b/CRM/Contact/Form/Task/Email.php
@@ -22,36 +22,6 @@ class CRM_Contact_Form_Task_Email extends CRM_Contact_Form_Task {
 
   use CRM_Contact_Form_Task_EmailTrait;
 
-  /**
-   * Store "to" contact details.
-   * @var array
-   */
-  public $_toContactDetails = [];
-
-  /**
-   * Store all selected contact id's, that includes to, cc and bcc contacts
-   * @var array
-   */
-  public $_allContactIds = [];
-
-  /**
-   * Store only "to" contact ids.
-   * @var array
-   */
-  public $_toContactIds = [];
-
-  /**
-   * Store only "cc" contact ids.
-   * @var array
-   */
-  public $_ccContactIds = [];
-
-  /**
-   * Store only "bcc" contact ids.
-   * @var array
-   */
-  public $_bccContactIds = [];
-
   /**
    * Build all the data structures needed to build the form.
    *

diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php
@@ -37,6 +37,36 @@ trait CRM_Contact_Form_Task_EmailTrait {
    */
   public $_templates;
 
+  /**
+   * Store "to" contact details.
+   * @var array
+   */
+  public $_toContactDetails = [];
+
+  /**
+   * Store all selected contact id's, that includes to, cc and bcc contacts
+   * @var array
+   */
+  public $_allContactIds = [];
+
+  /**
+   * Store only "to" contact ids.
+   * @var array
+   */
+  public $_toContactIds = [];
+
+  /**
+   * Store only "cc" contact ids.
+   * @var array
+   */
+  public $_ccContactIds = [];
+
+  /**
+   * Store only "bcc" contact ids.
+   * @var array
+   */
+  public $_bccContactIds = [];
+
   /**
    * Process the form after the input has been submitted and validated.
    *