From 43d4ad93e20f69869f0ddfdf51d5fa33941a39b7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20T=C3=A9tard?= <olivier.tetard@miskin.fr>
Date: Mon, 20 Nov 2017 15:03:03 +0100
Subject: [PATCH] Merger: Add some more parameters to custom processing
 functions.

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 3a6eba7f6d..11f1a68384 100644
--- 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;
-- 
2.25.1