From cbed7205c6093db92aa6733053ea87cd067312ab Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 3 Mar 2016 13:59:57 +1300 Subject: [PATCH] Enough with double caching hard coded arrays --- CRM/Dedupe/Merger.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 301e7f7059..647c6335e3 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -979,11 +979,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m $$moniker = $result['values'][$cid]; } - static $fields = array(); - if (empty($fields)) { - $fields = CRM_Contact_DAO_Contact::fields(); - CRM_Core_DAO::freeResult(); - } + $fields = CRM_Contact_DAO_Contact::fields(); // FIXME: there must be a better way foreach (array('main', 'other') as $moniker) { -- 2.25.1