From 00499cf000b17ff3ab815344b32370be4d87346c Mon Sep 17 00:00:00 2001
From: Monish Deb <deb.monish@gmail.com>
Date: Thu, 12 Sep 2019 14:40:43 +0530
Subject: [PATCH] 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

---
 CRM/Event/Form/ManageEvent/EventInfo.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php
index 0bf756f151a2..b11e8d50f3b4 100644
--- 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);
     }