Eileen has uploaded a new change for review. https://gerrit.wikimedia.org/r/286560
Change subject: CRM-5507 CRM-17984 fix regression when subType var is not leaking ...................................................................... CRM-5507 CRM-17984 fix regression when subType var is not leaking This is part of a series of commits upstream in these PRs 4.6 https://github.com/civicrm/civicrm-core/pull/8183 https://github.com/civicrm/civicrm-core/pull/8221 https://github.com/civicrm/civicrm-core/pull/8248 https://github.com/civicrm/civicrm-core/pull/8252 https://github.com/civicrm/civicrm-core/pull/8263 https://github.com/civicrm/civicrm-core/pull/8275 master https://github.com/civicrm/civicrm-core/pull/8106 https://github.com/civicrm/civicrm-core/pull/8204 https://github.com/civicrm/civicrm-core/pull/8205 https://github.com/civicrm/civicrm-core/pull/8214 https://github.com/civicrm/civicrm-core/pull/8216 https://github.com/civicrm/civicrm-core/pull/8243 https://github.com/civicrm/civicrm-core/pull/8254 Change-Id: Ia7b5be54b375867e9043e6bf4f3f5f32ce4b2540 --- M CRM/Core/BAO/CustomGroup.php 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm refs/changes/60/286560/1 diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index 83370ed..5daddbc 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -526,8 +526,10 @@ continue; } // CRM-5507 - if ($fieldName == 'extends_entity_column_value' && $subType) { - $groupTree[$groupID]['subtype'] = trim($subType, CRM_Core_DAO::VALUE_SEPARATOR); + // This is an old bit of code - per the CRM number & probably does not work reliably if + // that one contact sub-type exists. + if ($fieldName == 'extends_entity_column_value' && !empty($subTypes[0])) { + $groupTree[$groupID]['subtype'] = self::validateSubTypeByEntity($entityType, $subType); } $groupTree[$groupID][$fieldName] = $crmDAO->$fullFieldName; } -- To view, visit https://gerrit.wikimedia.org/r/286560 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7b5be54b375867e9043e6bf4f3f5f32ce4b2540 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/civicrm 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
