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:
52fab18
)
Merger: Add some more parameters to custom processing functions.
author
Olivier Tétard
<olivier.tetard@miskin.fr>
Mon, 20 Nov 2017 14:03:03 +0000
(15:03 +0100)
committer
Olivier Tétard
<olivier.tetard@miskin.fr>
Tue, 20 Mar 2018 08:51:21 +0000
(09:51 +0100)
When calling for some custom processing function in the merge process,
add tables that needs to be merged and related options.
CRM/Dedupe/Merger.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index 3a6eba7f6d0fb426e6b8ef360af1fdfbe81fd1eb..11f1a68384b479e2767db1ba6caf227762b1d7c8 100644
(file)
--- a/
CRM/Dedupe/Merger.php
+++ b/
CRM/Dedupe/Merger.php
@@
-518,7
+518,7
@@
INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
// Call custom processing function for objects that require it
if (isset($cpTables[$table])) {
foreach ($cpTables[$table] as $className => $fnName) {
- $className::$fnName($mainId, $otherId, $sqls);
+ $className::$fnName($mainId, $otherId, $sqls
, $tables, $tableOperations
);
}
// Skip normal processing
continue;