jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395882 )
Change subject: Allow Organization merge to resolve casing on organization_name
......................................................................
Allow Organization merge to resolve casing on organization_name
Bug: T18108
Change-Id: I31f9cd0cb539f7e9dcbd2f1921906a9d7ca6d5a5
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 6e07755..746c901 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2546,7 +2546,7 @@
* @return bool
*/
function _wmf_civicrm_merge_resolve_casing_conflict($fieldName,
&$moveFieldValue, &$valueToKeep, &$valueToOverwrite) {
- $fieldsToResolveCasingFor = array('last_name', 'first_name');
+ $fieldsToResolveCasingFor = array('last_name', 'first_name',
'organization_name');
if (!in_array(str_replace('move_', '', $fieldName),
$fieldsToResolveCasingFor)) {
return FALSE;
}
--
To view, visit https://gerrit.wikimedia.org/r/395882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31f9cd0cb539f7e9dcbd2f1921906a9d7ca6d5a5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
