From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 3 Mar 2016 00:59:57 +0000 (+1300)
Subject: Enough with double caching hard coded arrays
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cbed7205c6093db92aa6733053ea87cd067312ab;p=civicrm-core.git

Enough with double caching hard coded arrays
---

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) {