From c1a315f44be69020339c7672b2d22b8f347d4996 Mon Sep 17 00:00:00 2001 From: Pratik Joshi Date: Mon, 28 Oct 2013 12:51:27 +0530 Subject: [PATCH] CRM-13657 : more code improvement needed to be done ---------------------------------------- * CRM-13657: Fatal error when accessing civicase http://issues.civicrm.org/jira/browse/CRM-13657 --- CRM/Activity/Form/Task.php | 2 +- CRM/Activity/Form/Task/Batch.php | 2 +- CRM/Activity/Form/Task/SearchTaskHookSample.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php index 7e732603d3..3f69410a00 100644 --- a/CRM/Activity/Form/Task.php +++ b/CRM/Activity/Form/Task.php @@ -152,7 +152,7 @@ class CRM_Activity_Form_Task extends CRM_Core_Form { public function setContactIDs() { $IDs = implode(',', $this->_activityHolderIds); - $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name'); $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $query = " SELECT contact_id diff --git a/CRM/Activity/Form/Task/Batch.php b/CRM/Activity/Form/Task/Batch.php index 92252f9d18..068ac7c084 100755 --- a/CRM/Activity/Form/Task/Batch.php +++ b/CRM/Activity/Form/Task/Batch.php @@ -262,7 +262,7 @@ FROM civicrm_activity a JOIN civicrm_activity_contact ac ON ( ac.activity_id = a.id AND ac.record_type_id = %2 ) WHERE a.id = %1 "; - $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name'); $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $params = array(1 => array($key, 'Integer'), 2 => array($sourceID, 'Integer')); $dao = CRM_Core_DAO::executeQuery($query, $params); diff --git a/CRM/Activity/Form/Task/SearchTaskHookSample.php b/CRM/Activity/Form/Task/SearchTaskHookSample.php index 11dd5e2ade..c2dcd1ed9f 100644 --- a/CRM/Activity/Form/Task/SearchTaskHookSample.php +++ b/CRM/Activity/Form/Task/SearchTaskHookSample.php @@ -50,7 +50,7 @@ class CRM_Activity_Form_Task_SearchTaskHookSample extends CRM_Activity_Form_Task // display name and activity details of all selected contacts $activityIDs = implode(',', $this->_activityHolderIds); - $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name'); $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $query = " SELECT at.subject as subject, -- 2.25.1