From ae6455b2799767ab9c5c228ca0d8e3522bd005b7 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 26 May 2016 14:46:27 +1200 Subject: [PATCH] Cleanup a couple of unused vars --- CRM/Dedupe/Merger.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 2a1923495d..24f5ce4ffd 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -682,8 +682,13 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m CRM_Core_BAO_PrevNextCache::setItem($values); } + /** + * Delete information about merges for the given string. + * + * @param $cacheKeyString + */ public static function resetMergeStats($cacheKeyString) { - return CRM_Core_BAO_PrevNextCache::deleteItem(NULL, "{$cacheKeyString}_stats"); + CRM_Core_BAO_PrevNextCache::deleteItem(NULL, "{$cacheKeyString}_stats"); } public static function getMergeStats($cacheKeyString) { @@ -1227,11 +1232,9 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m foreach ($values['values'] as $index => $value) { $locations[$moniker][$blockName][$cnt] = $value; // Fix address display - $display = ''; if ($blockName == 'address') { CRM_Core_BAO_Address::fixAddress($value); - $display = CRM_Utils_Address::format($value); - $locations[$moniker][$blockName][$cnt]['display'] = $display; + $locations[$moniker][$blockName][$cnt]['display'] = CRM_Utils_Address::format($value); } $cnt++; -- 2.25.1