projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f2ad1d
)
Cleanup unused variables
author
JKingsnorth
<john@johnkingsnorth.co.uk>
Tue, 24 Nov 2015 16:00:19 +0000
(16:00 +0000)
committer
JKingsnorth
<john@johnkingsnorth.co.uk>
Tue, 24 Nov 2015 16:00:19 +0000
(16:00 +0000)
CRM/Dedupe/Merger.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index 23c146242208781bbac4484445e7a5d8daf258dc..6db26b714a93274b3af96b62c0bde1aee17f2a76 100644
(file)
--- 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(