From ca666aac357959ee17369e64b0dfdccbaf5265cc Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 7 Apr 2023 11:34:59 +1200 Subject: [PATCH] Do not consider greeting display names in merges As surfaced by api_v3_ContactTest::testMergeGetConflicts these are basically caches of calculated fields --- CRM/Dedupe/Merger.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 1e1a6d6a0d..61b3131de6 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -2778,8 +2778,12 @@ ORDER BY civicrm_custom_group.weight, 'id', 'modified_date', 'primary_contact_id', - 'sort_name', 'user_unique_id', + // These are effectively cached / calculated fields + 'sort_name', + 'email_greeting_display', + 'postal_greeting_display', + 'addressee_display', ], ]; return $keysToIgnore[$type]; -- 2.25.1