Further pass-by-ref fixes following on from customGroup signature change

Change-Id: I4398472485f27165b197f00bf36d518509681242

diff --git a/CRM/Custom/Form/CustomData.php b/CRM/Custom/Form/CustomData.php
index a64e4e43c1a8dc8fa58230d82b3ab63bdf99c2ff..9d3cefba5abe9e8c7adc7d14160156b57c136c77 100644 (file)
--- a/CRM/Custom/Form/CustomData.php
+++ b/CRM/Custom/Form/CustomData.php
@@ -125,7 +125,7 @@ class CRM_Custom_Form_CustomData {
       $subType = str_replace(CRM_Core_DAO::VALUE_SEPARATOR, ',', trim($subType, CRM_Core_DAO::VALUE_SEPARATOR));
     }
 
-    $groupTree = &CRM_Core_BAO_CustomGroup::getTree($form->_type,
+    $groupTree = CRM_Core_BAO_CustomGroup::getTree($form->_type,
       $form,
       $form->_entityId,
       $gid,

diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php
index b5ac2d5a0df60bed92115a9ddbe740f1b473444c..9fbccf19a91a2bca9f8af219ae6d1a9203a8a074 100644 (file)
--- a/CRM/Utils/DeprecatedUtils.php
+++ b/CRM/Utils/DeprecatedUtils.php
@@ -952,7 +952,7 @@ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) {
   /* Check for custom field values */
 
   if (empty($fields['custom'])) {
-    $fields['custom'] = &CRM_Core_BAO_CustomField::getFields(CRM_Utils_Array::value('contact_type', $values),
+    $fields['custom'] = CRM_Core_BAO_CustomField::getFields(CRM_Utils_Array::value('contact_type', $values),
       FALSE, FALSE, NULL, NULL, FALSE, FALSE, FALSE
     );
   }

diff --git a/tools/extensions/org.civicrm.multisite/multisite.php b/tools/extensions/org.civicrm.multisite/multisite.php
index b232526ed5095709d9005059901a5fda0d0ea956..b534d2cd60c0370c45628138f2a0213a65b88053 100644 (file)
--- a/tools/extensions/org.civicrm.multisite/multisite.php
+++ b/tools/extensions/org.civicrm.multisite/multisite.php
@@ -190,7 +190,7 @@ function _multisite_get_all_child_groups($groupID, $includeParent = TRUE) {
   static $_cache = array();
 
   if (! array_key_exists($groupID, $_cache)) {
-    $childGroups = &CRM_Core_BAO_Cache::getItem('descendant groups for an org', $groupID);
+    $childGroups = CRM_Core_BAO_Cache::getItem('descendant groups for an org', $groupID);
 
     if (empty($childGroups)) {
       $childGroups = array();

diff --git a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
index 4b8cc366a6411c2042fb8f2eb0912966771f9509..4b92adc35cb9b025aafec37dd2168eb96e96e020 100644 (file)
--- a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
+++ b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
@@ -75,7 +75,7 @@ class org_civicrm_search_activityimplementsCRM_Contact_Form_Search_Interface {
 
     //Add custom fields to columns array for inclusion in export
     require_once 'CRM/Core/BAO/CustomGroup.php';
-    $groupTree = &CRM_Core_BAO_CustomGroup::getTree('Activity', $form, NULL,
+    $groupTree = CRM_Core_BAO_CustomGroup::getTree('Activity', NULL, NULL,
       NULL, '', NULL
     );
 
@@ -203,7 +203,7 @@ class org_civicrm_search_activityimplementsCRM_Contact_Form_Search_Interface {
 
     // add custom group fields to SELECT and FROM clause
     require_once 'CRM/Core/BAO/CustomGroup.php';
-    $groupTree = &CRM_Core_BAO_CustomGroup::getTree('Activity', $form, NULL, NULL, '', NULL);
+    $groupTree = CRM_Core_BAO_CustomGroup::getTree('Activity', NULL, NULL, NULL, '', NULL);
 
     foreach ($groupTree as $key) {
       if ($key['extends'] == 'Activity') {