From 426cf44f4bf63485b1bd39d93f96b51a340d42df Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 3 Jan 2021 10:07:22 +1300 Subject: [PATCH] dev/core#766 fix failure to save custom data on template-based-event --- CRM/Event/BAO/Event.php | 7 +++++++ CRM/Event/Form/ManageEvent/EventInfo.php | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php index 6adb77093d..750d2d372b 100644 --- a/CRM/Event/BAO/Event.php +++ b/CRM/Event/BAO/Event.php @@ -2297,6 +2297,13 @@ LEFT JOIN civicrm_price_field_value value ON ( value.id = lineItem.price_field 'template_title', ]; $defaults = array_diff_key($defaults, array_flip($fieldsToExclude)); + foreach ($defaults as $key => $value) { + $customFieldInfo = CRM_Core_BAO_CustomField::getKeyID($key, TRUE); + if (!empty($customFieldInfo[1])) { + $defaults[str_replace($customFieldInfo[1], '-' . $customFieldInfo[1], $key)] = $value; + unset($defaults[$key]); + } + } return $defaults; } diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php index 4a16a37fb4..9e1c5dfbf3 100644 --- a/CRM/Event/Form/ManageEvent/EventInfo.php +++ b/CRM/Event/Form/ManageEvent/EventInfo.php @@ -228,13 +228,6 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent { //merge params with defaults from templates if (!empty($params['template_id'])) { $params = array_merge(CRM_Event_BAO_Event::getTemplateDefaultValues($params['template_id']), $params); - foreach ($params as $key => $value) { - $customFieldInfo = CRM_Core_BAO_CustomField::getKeyID($key, TRUE); - if (!empty($customFieldInfo[1])) { - $params[str_replace($customFieldInfo[1], '-' . $customFieldInfo[1], $key)] = $value; - unset($params[$key]); - } - } } $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, -- 2.25.1