From 63a0726919a1a649ae3abd81a7ca6a01546cc332 Mon Sep 17 00:00:00 2001 From: Stephen Palmstrom Date: Thu, 12 Jan 2023 10:38:44 +0000 Subject: [PATCH] Issue 1984 - change $id to $contactID --- CRM/Core/BAO/UFGroup.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php index 03c38ba36c..3ccf9fe61d 100644 --- a/CRM/Core/BAO/UFGroup.php +++ b/CRM/Core/BAO/UFGroup.php @@ -730,8 +730,8 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup implements \Civi\Core\Ho $checkPermission = CRM_Core_Permission::EDIT; } // Make the cache user specific by adding the ID to the key. - $id = CRM_Core_Session::getLoggedInContactID(); - $cacheKey = 'uf_group_custom_fields_' . $ctype . '_' . $id . '_' . (int) $checkPermission; + $contactId = CRM_Core_Session::getLoggedInContactID(); + $cacheKey = 'uf_group_custom_fields_' . $ctype . '_' . $contactId . '_' . (int) $checkPermission; if (!Civi::cache('metadata')->has($cacheKey)) { $customFields = CRM_Core_BAO_CustomField::getFieldsForImport($ctype, FALSE, FALSE, FALSE, $checkPermission, TRUE); @@ -922,7 +922,7 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup implements \Civi\Core\Ho if (!empty($_POST)) { $supressForm = CRM_Core_Config::singleton()->userSystem->suppressProfileFormErrors(); $template->assign('suppressForm', $supressForm); - } + } $templateFile = "CRM/Profile/Form/{$profileID}/Dynamic.tpl"; if (!$template->template_exists($templateFile)) { -- 2.25.1