From 978b982d3de8858ba6f9dbd1fbeef872107d3342 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Fri, 14 Feb 2020 10:57:25 -0500 Subject: [PATCH] avoid error when merging record with null create date https://lab.civicrm.org/dev/core/issues/1589 --- CRM/Dedupe/Merger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 12ec5faaa5..c5f063d1df 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1357,7 +1357,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m 'id' => $otherId, 'return' => ['created_date'], ])['created_date']; - if ($otherCreatedDate < $mainCreatedDate) { + if ($otherCreatedDate < $mainCreatedDate && !empty($otherCreatedDate)) { CRM_Core_DAO::executeQuery("UPDATE civicrm_contact SET created_date = %1 WHERE id = %2", [ 1 => [$otherCreatedDate, 'String'], 2 => [$mainId, 'Positive'], -- 2.25.1