From 79a1b91fd50a0f19373739d166c424bb83b60d87 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 25 Mar 2023 14:17:29 +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 2c02b615e19..5e352409b02 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -2122,9 +2122,9 @@ ORDER BY civicrm_custom_group.weight,
if (strpos($key, 'custom_') === 0) {
$fieldID = (int) substr($key, 7);
if (empty($cFields[$fieldID])) {
- $htmlType = $cFields[$fieldID]['attributes']['html_type'];
+ $htmlType = (string) $cFields[$fieldID]['attributes']['html_type'];
$isSerialized = CRM_Core_BAO_CustomField::isSerialized($cFields[$fieldID]['attributes']);
- $isView = $cFields[$fieldID]['attributes']['is_view'];
+ $isView = (bool) $cFields[$fieldID]['attributes']['is_view'];
$submitted = self::processCustomFields($mainId, $key, $submitted, $value, $fieldID, $isView, $htmlType, $isSerialized);
}
--
GitLab