From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Tue, 24 Nov 2015 16:00:19 +0000 (+0000)
Subject: Cleanup unused variables
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b814df566975e2f2fa7e26bf8261c84901c0ead3;p=civicrm-core.git

Cleanup unused variables
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 23c1462422..6db26b714a 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1109,9 +1109,8 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       'main' => array(),
       'other' => array(),
     );
-    $mainLocBlock = $locBlockIds = array();
-    $locBlockIds['main'] = $locBlockIds['other'] = array();
-    $typeBlockIds['main'] = $typeBlockIds['other'] = array();
+
+    $mainLocBlock = array();
 
     // @todo This could probably be defined and used earlier
     $mergeTargets = array(