Enough with double caching hard coded arrays

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 301e7f70591bcec40768eb65320d20054a9eeac2..647c6335e3ec4a55a38a8d3c9ec6c22c4e2b9fd3 100644 (file)
--- 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) {