Merge pull request #16979 from eileenmcnaughton/cw

Use isSerialized function rather guessing from html_type
civicrm · Apr 5, 2020 · cb94806 · cb94806
2 parents e546963 + 726e45e
commit cb94806
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php
@@ -652,7 +652,7 @@ private function deprecatedFormatParams($params, &$values, $create = FALSE, $onD
       if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) {
         $values[$key] = $value;
         $type = $customFields[$customFieldID]['html_type'];
-        if ($type == 'CheckBox' || $type == 'Multi-Select') {
+        if (CRM_Core_BAO_CustomField::isSerialized($customFields[$customFieldID])) {
           $mulValues = explode(',', $value);
           $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
           $values[$key] = [];

diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php
@@ -512,7 +512,7 @@ protected function formatValues(&$values, $params) {
       if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) {
         $values[$key] = $value;
         $type = $customFields[$customFieldID]['html_type'];
-        if ($type == 'CheckBox' || $type == 'Multi-Select') {
+        if (CRM_Core_BAO_CustomField::isSerialized($customFields[$customFieldID])) {
           $mulValues = explode(',', $value);
           $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
           $values[$key] = [];

diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php
@@ -630,7 +630,7 @@ public function membership_format_params($params, &$values, $create = FALSE) {
       if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) {
         $values[$key] = $value;
         $type = $customFields[$customFieldID]['html_type'];
-        if ($type == 'CheckBox' || $type == 'Multi-Select') {
+        if (CRM_Core_BAO_CustomField::isSerialized($customFields[$customFieldID])) {
           $mulValues = explode(',', $value);
           $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
           $values[$key] = [];

diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php
@@ -134,7 +134,7 @@ function _civicrm_api3_deprecated_activity_formatted_param(&$params, &$values, $
     if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) {
       $values[$key] = $value;
       $type = $customFields[$customFieldID]['html_type'];
-      if ($type == 'CheckBox' || $type == 'Multi-Select') {
+      if (CRM_Core_BAO_CustomField::isSerialized($customFields[$customFieldID])) {
         $mulValues = explode(',', $value);
         $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
         $values[$key] = [];