From 8dd1a234308bbb6be8a7a0299d5ea8325a7af55d Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 15 Jul 2023 13:39:02 +1200
Subject: [PATCH] Remove last reference to undefined property ->_subType

---
 CRM/Custom/Form/CustomDataByType.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Custom/Form/CustomDataByType.php b/CRM/Custom/Form/CustomDataByType.php
index 25d4d635dc..0b8b619b86 100644
--- a/CRM/Custom/Form/CustomDataByType.php
+++ b/CRM/Custom/Form/CustomDataByType.php
@@ -33,13 +33,13 @@ class CRM_Custom_Form_CustomDataByType extends CRM_Core_Form {
   public function preProcess() {
 
     $this->_type = $this->_cdType = CRM_Utils_Request::retrieve('type', 'String', CRM_Core_DAO::$_nullObject, TRUE);
-    $this->_subType = CRM_Utils_Request::retrieve('subType', 'String');
+    $subType = CRM_Utils_Request::retrieve('subType', 'String');
     $this->_subName = CRM_Utils_Request::retrieve('subName', 'String');
     $this->_groupCount = CRM_Utils_Request::retrieve('cgcount', 'Positive');
     $this->_entityId = CRM_Utils_Request::retrieve('entityID', 'Positive');
     $this->_contactID = CRM_Utils_Request::retrieve('cid', 'Positive');
     $this->_groupID = CRM_Utils_Request::retrieve('groupID', 'Positive');
-    $this->_onlySubtype = CRM_Utils_Request::retrieve('onlySubtype', 'Boolean');
+    $onlySubType = CRM_Utils_Request::retrieve('onlySubtype', 'Boolean');
     $this->_action = CRM_Utils_Request::retrieve('action', 'Alphanumeric');
     $this->assign('cdType', FALSE);
     $this->assign('cgCount', $this->_groupCount);
@@ -48,7 +48,7 @@ class CRM_Custom_Form_CustomDataByType extends CRM_Core_Form {
     if (array_key_exists($this->_type, $contactTypes)) {
       $this->assign('contactId', $this->_entityId);
     }
-    $this->setGroupTree($this, $this->_subType, $this->_groupID, $this->_onlySubtype);
+    $this->setGroupTree($this, $subType, $this->_groupID, $onlySubType);
 
     $this->assign('suppressForm', TRUE);
     $this->controller->_generateQFKey = FALSE;
-- 
2.25.1