jenkins-bot has submitted this change and it was merged.

Change subject: CRM-19198 Add form merge hook call to dedupe form
......................................................................


CRM-19198 Add form merge hook call to dedupe form

Bug: T142008
Change-Id: Ie8b1a3301a716d3e9c898d311d4fcf630f099f01
---
M CRM/Contact/Form/Merge.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index 52e97b1..b574c31 100644
--- a/CRM/Contact/Form/Merge.php
+++ b/CRM/Contact/Form/Merge.php
@@ -317,8 +317,9 @@
 
     $formValues['main_details'] = $this->_mainDetails;
     $formValues['other_details'] = $this->_otherDetails;
-
-    CRM_Dedupe_Merger::moveAllBelongings($this->_cid, $this->_oid, 
$formValues);
+    $migrationData = array('migration_info' => $formValues);
+    CRM_Utils_Hook::merge('form', $migrationData, $this->_cid, $this->_oid);
+    CRM_Dedupe_Merger::moveAllBelongings($this->_cid, $this->_oid, 
$migrationData['migration_info']);
 
     $name = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', 
$this->_cid, 'display_name');
     $message = '<ul><li>' . ts('%1 has been updated.', array(1 => $name)) . 
'</li><li>' . ts('Contact ID %1 has been deleted.', array(1 => $this->_oid)) . 
'</li></ul>';

-- 
To view, visit https://gerrit.wikimedia.org/r/303767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8b1a3301a716d3e9c898d311d4fcf630f099f01
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to