From b34aa4e97fc0a71f6a7768b4bccace3b20d61098 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 24 Mar 2023 16:43:06 +1300
Subject: [PATCH] dev/core#4197 Ensure parameters are correct type
---
CRM/Dedupe/Merger.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index b09c0c1bad5..4071797bdf7 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -2115,9 +2115,9 @@ ORDER BY civicrm_custom_group.weight,
$fieldID = (int) substr($key, 7);
$fieldMetadata = CRM_Core_BAO_CustomField::getCustomFieldsForContactType($contactType, FALSE)[$fieldID] ?? NULL;
if ($fieldMetadata) {
- $htmlType = $fieldMetadata['html_type'];
+ $htmlType = (string) $fieldMetadata['html_type'];
$isSerialized = CRM_Core_BAO_CustomField::isSerialized($fieldMetadata);
- $isView = $fieldMetadata['is_view'];
+ $isView = (bool) $fieldMetadata['is_view'];
if ($isView) {
$viewOnlyCustomFields[$key] = $value;
}
--
GitLab