Merge pull request #17526 from mattwire/frontendrequiredpaymentfrequency

[civicrm-core.git] / CRM / Custom / Page / Group.php

diff --git a/CRM/Custom/Page/Group.php b/CRM/Custom/Page/Group.php
index e0bb74ac159c8dcdbf15a38ae42824368e99b48b..d8a931e63dce2d7b5014ac9a35015df1b9e62ff7 100644 (file)
--- a/CRM/Custom/Page/Group.php
+++ b/CRM/Custom/Page/Group.php
@@ -268,9 +268,9 @@ class CRM_Custom_Page_Group extends CRM_Core_Page {
     CRM_Core_BAO_CustomGroup::getExtendedObjectTypes($subTypes);
 
     foreach ($customGroup as $key => $values) {
-      $subValue = CRM_Utils_Array::value('extends_entity_column_value', $customGroup[$key]);
-      $subName = CRM_Utils_Array::value('extends_entity_column_id', $customGroup[$key]);
-      $type = CRM_Utils_Array::value('extends', $customGroup[$key]);
+      $subValue = $customGroup[$key]['extends_entity_column_value'] ?? NULL;
+      $subName = $customGroup[$key]['extends_entity_column_id'] ?? NULL;
+      $type = $customGroup[$key]['extends'] ?? NULL;
       if ($subValue) {
         $subValue = explode(CRM_Core_DAO::VALUE_SEPARATOR,
           substr($subValue, 1, -1)
@@ -296,14 +296,14 @@ class CRM_Custom_Page_Group extends CRM_Core_Page {
               }
             }
             else {
-              $colValue = $colValue ? ($colValue . (isset($subTypes[$type][$sub]) ? ', ' . $subTypes[$type][$sub] : '')) : (isset($subTypes[$type][$sub]) ? $subTypes[$type][$sub] : '');
+              $colValue = $colValue ? ($colValue . (isset($subTypes[$type][$sub]) ? ', ' . $subTypes[$type][$sub] : '')) : ($subTypes[$type][$sub] ?? '');
             }
           }
         }
         $customGroup[$key]["extends_entity_column_value"] = $colValue;
       }
       else {
-        if (is_array(CRM_Utils_Array::value($type, $subTypes))) {
+        if (isset($subTypes[$type]) && is_array($subTypes[$type])) {
           $customGroup[$key]["extends_entity_column_value"] = ts("Any");
         }
       }