Eileen has submitted this change and it was merged.
Change subject: Remove code to include our custom tables.
......................................................................
Remove code to include our custom tables.
This is actually handled fine in core now as evidenced by the fact these fields
appear in the fields_in_conflict above. In addition, the only custom tables we
have that do not fit the
naming scheme are wmf_donor - which is deliberately excluded and
wmf_contribution_extra which
does not extend contacts and does not need to be included.
Bug: T133625
Change-Id: I604b9967fdafc46fb2949f8f80366efac9c7cfd0
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 0 insertions(+), 20 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index a1cce3f..1f64f6b 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2047,26 +2047,6 @@
}
break;
- case 'cidRefs':
- // adds our custom tables, except for wmf_donor, which is recalculated
- $contact_types = array( "Contact" );
- $contact_types = array_merge(
CRM_Contact_BAO_ContactType::basicTypes(), $contact_types );
- foreach ( $contact_types as &$type ) {
- $type = "'" . $type . "'";
- }
- $contact_types = implode( ", ", $contact_types );
-
- $sql = <<<EOS
-SELECT table_name
-FROM civicrm_custom_group
-WHERE extends IN ( $contact_types )
-AND table_name <> 'wmf_donor'
-EOS;
- $dao = CRM_Core_DAO::executeQuery( $sql );
- while ( $dao->fetch() ) {
- $refs[ $dao->table_name ][] = 'entity_id';
- }
- break;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/294660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I604b9967fdafc46fb2949f8f80366efac9c7cfd0
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Eileen <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
