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:
abd0b85
)
Style fix
author
JKingsnorth
<john@johnkingsnorth.co.uk>
Thu, 18 Aug 2016 14:54:03 +0000
(15:54 +0100)
committer
JKingsnorth
<john@johnkingsnorth.co.uk>
Thu, 18 Aug 2016 14:54:03 +0000
(15:54 +0100)
CRM/Dedupe/Merger.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index 625756223c32eebd954d4882830ac110b8394501..ac2baa7f42376da1866e0b248821cf422e69478d 100644
(file)
--- a/
CRM/Dedupe/Merger.php
+++ b/
CRM/Dedupe/Merger.php
@@
-2118,7
+2118,7
@@
INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
// and remove it from the current primary location (if there is one).
// But only once for each entity.
$set_primary = CRM_Utils_Array::value('set_other_primary', $migrationInfo['location_blocks'][$name][$blkCount]);
- if (!$changePrimary && $set_primary == "1"){
+ if (!$changePrimary && $set_primary == "1")
{
$otherBlockDAO->is_primary = 1;
if ($primaryDAOId) {
$removePrimaryDAO = new $daoName();