Eileen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/294428
Change subject: Per merge connection id
......................................................................
Per merge connection id
Bug: T135063
Change-Id: I4c7be2b235fbc28bd6c30abbdc91a8a7e2b78f49
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/28/294428/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 04d570a..a1cce3f 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2031,6 +2031,7 @@
function wmf_civicrm_civicrm_merge( $type, &$refs, $mainId, $otherId, $tables
) {
switch ( $type ) {
case 'batch' :
+ CRM_Core_DAO::executeQuery('SET @uniqueID = %1', array(1 =>
array(uniqid() . CRM_Utils_String::createRandom(CRM_Utils_String::ALPHANUMERIC,
4), 'String')));
if (isset($refs['fields_in_conflict'])){
$wmfCalculatedFields = wmf_civicrm_get_calculated_fields();
foreach ($wmfCalculatedFields as $wmfCalculatedField) {
--
To view, visit https://gerrit.wikimedia.org/r/294428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c7be2b235fbc28bd6c30abbdc91a8a7e2b78f49
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
