From 362e6a63652935386a5b6ec2fc9d254597f1c497 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 1 Apr 2020 11:14:44 +1300
Subject: [PATCH] Move properties to Trait

---
 CRM/Contact/Form/Task/Email.php      | 30 ----------------------------
 CRM/Contact/Form/Task/EmailTrait.php | 30 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/CRM/Contact/Form/Task/Email.php b/CRM/Contact/Form/Task/Email.php
index 82fb6a3ed6..b49a523c16 100644
--- 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
index 4450660c07..796e2ff283 100644
--- 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.
    *
-- 
2.25.1