correct logic for handling empty-array values for checkboxes;

civicrm · Apr 26, 2022 · 0f6e4e4 · 0f6e4e4
1 parent 6de1f67
commit 0f6e4e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/api/v3/utils.php b/api/v3/utils.php
@@ -1110,7 +1110,7 @@ function _civicrm_api3_custom_format_params($params, &$values, $extends, $entity
   foreach ($params as $key => $value) {
     list($customFieldID, $customValueID) = CRM_Core_BAO_CustomField::getKeyID($key, TRUE);
     if ($customFieldID && (!is_null($value))) {
-      if ($checkCheckBoxField && !empty($fields['custom_' . $customFieldID]) && $fields['custom_' . $customFieldID]['html_type'] == 'CheckBox') {
+      if ($checkCheckBoxField && isset($fields['custom_' . $customFieldID]) && $fields['custom_' . $customFieldID]['html_type'] == 'CheckBox') {
         formatCheckBoxField($value, 'custom_' . $customFieldID, $entity);
       }
 
@@ -1178,7 +1178,7 @@ function formatCheckBoxField(&$checkboxFieldValue, $customFieldLabel, $entity) {
 
   $options = $options['values'];
   $validValue = TRUE;
-  if (is_array($checkboxFieldValue)) {
+  if (is_array($checkboxFieldValue) && !empty($checkboxFieldValue)) {
     foreach ($checkboxFieldValue as $key => $value) {
       if (!array_key_exists($key, $options)) {
         $validValue = FALSE;