Merge pull request #19308 from eileenmcnaughton/ev

dev/core#766 fix failure to save custom data on template-based-event
civicrm · Jan 7, 2021 · b97d805 · b97d805
2 parents 5fad922 + 426cf44
commit b97d805
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
@@ -2297,6 +2297,13 @@ public static function getTemplateDefaultValues($templateId) {
       '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
@@ -228,13 +228,6 @@ public function postProcess() {
     //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,