additional fix

diff --git a/CRM/Case/Form/Task/PDF.php b/CRM/Case/Form/Task/PDF.php
index 881dcac7654e00a0506e052754aae5a1a34a47fc..336204180d577efcdc9cc2b8a459b2866ce90640 100644 (file)
--- a/CRM/Case/Form/Task/PDF.php
+++ b/CRM/Case/Form/Task/PDF.php
@@ -50,10 +50,10 @@ class CRM_Case_Form_Task_PDF extends CRM_Case_Form_Task {
    * Build all the data structures needed to build the form.
    */
   public function preProcess() {
+    CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
     $this->skipOnHold = $this->skipDeceased = FALSE;
     parent::preProcess();
     $this->setContactIDs();
-    CRM_Contact_Form_Task_PDFLetterCommon::preProcess($this);
   }
 
   /**

diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
index 51e0478c478cbd5846fa5d1ec4e8ef38badcd7b8..02b146792ef9c3b7ac4a03b91477697d4de35787 100644 (file)
--- a/CRM/Contact/Form/Task/EmailCommon.php
+++ b/CRM/Contact/Form/Task/EmailCommon.php
@@ -69,11 +69,10 @@ class CRM_Contact_Form_Task_EmailCommon {
 
     $form->_emails = array();
 
+    // @TODO remove these line and to it somewhere more appropriate. Currently some classes (e.g Case
+    // are having to re-write contactIds afterwards due to this inappropriate variable setting
     // If we don't have any contact IDs, use the logged in contact ID
-    if (empty($form->_contactIds)) {
-      $contactID = CRM_Core_Session::singleton()->getLoggedInContactID();
-      $form->_contactIds = array($contactID);
-    }
+    $form->_contactIds = $form->_contactIds ?: [CRM_Core_Session::getLoggedInContactID()];
 
     $fromEmailValues = CRM_Core_BAO_Email::getFromEmail();