Merge pull request #15292 from JMAConsulting/core-1241

dev/core#1241 : Custom field value for a new Event based on an Event Template are not checked causing false validation message and Event not to save
civicrm · Sep 13, 2019 · ad62d26 · ad62d26
2 parents f299158 + 00499cf
commit ad62d26
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -66,9 +66,9 @@ public function preProcess() {
       $this->set('type', 'Event');
       $this->set('subType', CRM_Utils_Array::value('event_type_id', $_POST));
       $this->assign('customDataSubType', CRM_Utils_Array::value('event_type_id', $_POST));
-      $this->set('entityId', $this->_id);
+      $this->set('entityId', $entityID);
 
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_eventType, 1, 'Event', $this->_id);
+      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_eventType, 1, 'Event', $entityID);
       CRM_Custom_Form_CustomData::buildQuickForm($this);
       CRM_Custom_Form_CustomData::setDefaultValues($this);
     }