Merge pull request #13524 from eileenmcnaughton/search_rc

Revert fix causing unreleased regression
civicrm · Feb 4, 2019 · aaaf733 · aaaf733
2 parents bb50227 + 8706194
commit aaaf733
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php
@@ -695,7 +695,7 @@ public static function createHiddenSmartGroup($params) {
     //create/update saved search record.
     $savedSearch = new CRM_Contact_BAO_SavedSearch();
     $savedSearch->id = $ssId;
-    $savedSearch->form_values = serialize($params['form_values']);
+    $savedSearch->form_values = serialize(CRM_Contact_BAO_Query::convertFormValues($params['form_values']));
     $savedSearch->mapping_id = $mappingId;
     $savedSearch->search_custom_id = CRM_Utils_Array::value('search_custom_id', $params);
     $savedSearch->save();

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
@@ -314,7 +314,7 @@ public function postProcess() {
 
     CRM_Core_BAO_CustomValue::fixCustomFieldValue($this->_formValues);
 
-    $this->_formValues = $this->_params = CRM_Contact_BAO_Query::convertFormValues($this->_formValues, 0, FALSE, NULL, $this->entityReferenceFields);
+    $this->_params = CRM_Contact_BAO_Query::convertFormValues($this->_formValues, 0, FALSE, NULL, $this->entityReferenceFields);
     $this->_returnProperties = &$this->returnProperties();
     parent::postProcess();
   }

diff --git a/tests/phpunit/CRM/Contact/BAO/GroupTest.php b/tests/phpunit/CRM/Contact/BAO/GroupTest.php
@@ -252,11 +252,9 @@ public function testHiddenSmartGroup() {
 
     $contactID = $this->individualCreate(['custom_' . $customFieldID => 'abc']);
 
-    $formValues = ['custom_' . $customFieldID => ['LIKE' => '%a%']];
-
     $hiddenSmartParams = [
       'group_type' => ['2' => 1],
-      'form_values' => CRM_Contact_BAO_Query::convertFormValues($formValues),
+      'form_values' => ['custom_' . $customFieldID => ['LIKE' => '%a%']],
       'saved_search_id' => NULL,
       'search_custom_id' => NULL,
       'search_context' => 'advanced',