From: monishdeb <monish.deb@webaccessglobal.com>
Date: Tue, 26 Aug 2014 10:19:02 +0000 (+0530)
Subject: CRM-15139 QA fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9f8dff819bcb806b131359feaaaf0339e5a61639;p=civicrm-core.git

CRM-15139 QA fix

----------------------------------------
* CRM-15139: Batch update does not show values when using custom fields limited by event type
  https://issues.civicrm.org/jira/browse/CRM-15139
---

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index 5d70d16c20..95b96d7196 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -191,7 +191,7 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
             );
           }
           $entityColumnValueRole = CRM_Utils_Array::value($roleId, $entityColumnValue);
-          $entityColumnValueEventType = CRM_Utils_Array::value(array_search($eventTypeId, $entityColumnValue), $entityColumnValue);
+          $entityColumnValueEventType = in_array($eventTypeId, $entityColumnValue) ? $eventTypeId : NULL;
           if (($this->_roleCustomDataTypeID == $customValue['extends_entity_column_id']) &&
             ($entityColumnValueRole)
           ) {