From d241bb1fc3f7147e5547a9dde18b251be9ebcf89 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 28 Jul 2023 14:56:26 +1200
Subject: [PATCH] Notice fixes on CiviEvent Component settings form

---
 CRM/Admin/Form/Generic.php             | 3 +++
 templates/CRM/Form/basicFormFields.tpl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CRM/Admin/Form/Generic.php b/CRM/Admin/Form/Generic.php
index 8f996a2886..1b27f2bcff 100644
--- a/CRM/Admin/Form/Generic.php
+++ b/CRM/Admin/Form/Generic.php
@@ -51,9 +51,12 @@ class CRM_Admin_Form_Generic extends CRM_Core_Form {
 
   /**
    * Build the form object.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function buildQuickForm() {
     $this->addFieldsDefinedInSettingsMetadata();
+    $this->assign('entityInClassFormat', 'setting');
 
     // @todo - do we still like this redirect?
     CRM_Core_Session::singleton()->pushUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1'));
diff --git a/templates/CRM/Form/basicFormFields.tpl b/templates/CRM/Form/basicFormFields.tpl
index ada6e58dab..a884f4ff3d 100644
--- a/templates/CRM/Form/basicFormFields.tpl
+++ b/templates/CRM/Form/basicFormFields.tpl
@@ -12,7 +12,7 @@
 
   {foreach from=$fields item=fieldSpec}
     {assign var=fieldName value=$fieldSpec.name}
-    <tr class="crm-{if !empty($entityInClassFormat)}{$entityInClassFormat}{/if}-form-block-{$fieldName}">
+    <tr class="crm-{$entityInClassFormat}-form-block-{$fieldName}">
       {include file="CRM/Core/Form/Field.tpl"}
     </tr>
   {/foreach}
-- 
2.25.1