Merge pull request #18153 from larssg-wildsight/patch-1

[civicrm-core.git] / CRM / UF / Form / Group.php

diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php
index f531dfbbb840d47509f99c39c5eda606564220a5..a9fef4dc8fef3722bc6db7a0ab440bb258fa02a2 100644 (file)
--- a/CRM/UF/Form/Group.php
+++ b/CRM/UF/Form/Group.php
@@ -90,13 +90,6 @@ class CRM_UF_Form_Group extends CRM_Core_Form {
     return 'UFGroup';
   }
 
-  /**
-   * The form id saved to the session for an update.
-   *
-   * @var int
-   */
-  protected $_id;
-
   /**
    * The title for group.
    *
@@ -271,14 +264,14 @@ class CRM_UF_Form_Group extends CRM_Core_Form {
 
       $params = ['id' => $this->_id];
       CRM_Core_BAO_UFGroup::retrieve($params, $defaults);
-      $defaults['group'] = CRM_Utils_Array::value('limit_listings_group_id', $defaults);
-      $defaults['add_contact_to_group'] = CRM_Utils_Array::value('add_to_group_id', $defaults);
+      $defaults['group'] = $defaults['limit_listings_group_id'] ?? NULL;
+      $defaults['add_contact_to_group'] = $defaults['add_to_group_id'] ?? NULL;
       //get the uf join records for current uf group
       $ufJoinRecords = CRM_Core_BAO_UFGroup::getUFJoinRecord($this->_id);
       foreach ($ufJoinRecords as $key => $value) {
         $checked[$value] = 1;
       }
-      $defaults['uf_group_type'] = isset($checked) ? $checked : "";
+      $defaults['uf_group_type'] = $checked ?? "";
 
       $showAdvanced = 0;
       $advFields = [