CRM-13657 : more code improvement needed to be done

----------------------------------------
* CRM-13657: Fatal error when accessing civicase
  http://issues.civicrm.org/jira/browse/CRM-13657

diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
index 7e732603d3a7adb74e6c615d31e85e8abcec74cb..3f69410a00c0ce4440198a8629e4b95d2d70e3e4 100644 (file)
--- 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 92252f9d184aaee3f6c6edf770f0300f27e8ee3c..068ac7c084f0b8dd8fada5289f062e0e04eb5061 100755 (executable)
--- 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 11dd5e2adeb592736ffa43318cf07edd07b863aa..c2dcd1ed9f3a508bca9c351bd15eaa5713cc5bc3 100644 (file)
--- 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,