From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 6 Apr 2023 23:39:38 +0000 (+1200)
Subject: Adjust to APiv4 returning label as a field
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b39ecb045ebed5c3b76f05ca6332eacc75a0e833;p=civicrm-core.git

Adjust to APiv4 returning label as a field

As tested by CRM_Dedupe_MergerTest::testGetRowsElementsAndInfoSpecialInfo
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 61b3131de6..d0110b8bfb 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1546,7 +1546,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       $rows["move_$field"] = [
         'main' => self::getFieldValueAndLabel($field, $main)['label'],
         'other' => self::getFieldValueAndLabel($field, $other)['label'],
-        'title' => $fields[$field]['html']['label'] ?? $fields[$field]['title'],
+        'title' => $fields[$field]['label'],
       ];
 
       $value = self::getFieldValueAndLabel($field, $other)['value'];