Merge pull request #14063 from JMAConsulting/core-553

dev/core#553: Creating new event takes value from default value not from saved template for custom fields
civicrm · Apr 24, 2019 · b5a59db · b5a59db
2 parents 6eca48d + 83fd174
commit b5a59db
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -48,10 +48,11 @@ public function preProcess() {
     parent::preProcess();
     $this->assign('selectedChild', 'settings');
 
-    if ($this->_id) {
-      $this->assign('entityID', $this->_id);
+    $entityID = $this->_id ?: $this->_templateId;
+    if ($entityID) {
+      $this->assign('entityID', $entityID);
       $eventType = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event',
-        $this->_id,
+        $entityID,
         'event_type_id'
       );
     }
@@ -127,7 +128,6 @@ public function buildQuickForm() {
     if ($this->_eventType) {
       $this->assign('customDataSubType', $this->_eventType);
     }
-    $this->assign('entityId', $this->_id);
 
     $this->_first = TRUE;
     $this->applyFilter('__ALL__', 'trim');