From cd861d2b315e2e2e03c7a6410c7ab5cd5b1165db Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 17 Sep 2020 15:14:11 +1200 Subject: [PATCH] [Ref] Remove obsolete check When looking into ->getLocationBlocksToMerge(); it's not really possible anymore for locBlocks to contain a block that is not an array - we can remove this check for less brain pain --- CRM/Dedupe/Merger.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 745d7464e7..b389807221 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1806,9 +1806,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m foreach ($locBlocks as $name => $block) { $blocksDAO[$name] = ['delete' => [], 'update' => []]; - if (!is_array($block) || CRM_Utils_System::isNull($block)) { - continue; - } $daoName = 'CRM_Core_DAO_' . $locationBlocks[$name]['label']; $changePrimary = FALSE; $primaryDAOId = (array_key_exists($name, $primaryBlockIds)) ? array_pop($primaryBlockIds[$name]) : NULL; -- 2.25.1