From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 5 Feb 2019 09:49:35 +0000 (+1300)
Subject: dev/core#469 Fix Error on action 'Email - schedule/send via CiviMail' with multiple... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d1249113599d135186c1951aedb10e70cf41123a;p=civicrm-core.git

dev/core#469 Fix Error on action 'Email - schedule/send via CiviMail' with multiple event names filter

Alternate fix to reverted https://github.com/civicrm/civicrm-core/pull/13250
---

diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php
index a8b9691776..74a62c32a0 100644
--- a/CRM/Contact/Form/Task.php
+++ b/CRM/Contact/Form/Task.php
@@ -544,7 +544,9 @@ class CRM_Contact_Form_Task extends CRM_Core_Form_Task {
       $ssId = $this->get('ssID');
       $hiddenSmartParams = array(
         'group_type' => array('2' => 1),
-        'form_values' => $this->get('formValues'),
+        // queryParams have been preprocessed esp WRT any entity reference fields - see +
+        // https://github.com/civicrm/civicrm-core/pull/13250
+        'form_values' => $this->get('queryParams'),
         'saved_search_id' => $ssId,
         'search_custom_id' => $this->get('customSearchID'),
         'search_context' => $this->get('context'),