From 7d5091293c64ceda307d0ea599c1cb3815ca5abc Mon Sep 17 00:00:00 2001
From: Truong Giang <truongwp@gmail.com>
Date: Tue, 8 Jul 2025 23:36:07 +0700
Subject: [PATCH] Fix name field in minimized HTML

---
 .../front-end/combo-field/combo-field.php     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/classes/views/frm-fields/front-end/combo-field/combo-field.php b/classes/views/frm-fields/front-end/combo-field/combo-field.php
index ab37030990..26fb1efbc9 100644
--- a/classes/views/frm-fields/front-end/combo-field/combo-field.php
+++ b/classes/views/frm-fields/front-end/combo-field/combo-field.php
@@ -57,23 +57,23 @@ class="<?php echo esc_attr( $sub_field_class ); ?>"
 				<?php
 				switch ( $sub_field['type'] ) {
 					default:
-						?>
-						<input
-							type="<?php echo esc_attr( $sub_field['type'] ); ?>"
-							id="<?php echo esc_attr( $html_id . '_' . $name ); ?>"
-							value="<?php echo esc_attr( isset( $field_value[ $name ] ) ? $field_value[ $name ] : '' ); ?>"
-							<?php
-							if ( ! empty( $field_value[ $name ] ) ) {
-								echo 'data-frmval="' . esc_attr( $field_value[ $name ] ) . '" ';
-							}
-							if ( empty( $args['remove_names'] ) ) {
-								echo 'name="' . esc_attr( $field_name ) . '[' . esc_attr( $name ) . ']" ';
-							}
+						$attrs = array(
+							'type'  => $sub_field['type'],
+							'id'    => $html_id . '_' . $name,
+							'value' => isset( $field_value[ $name ] ) ? $field_value[ $name ] : '',
+						);
 
-							$this->print_input_atts( compact( 'field', 'sub_field' ) );
-							?>
-						/>
-						<?php
+						if ( ! empty( $field_value[ $name ] ) ) {
+							$attrs['data-frmval'] = $field_value[ $name ];
+						}
+						if ( empty( $args['remove_names'] ) ) {
+							$attrs['name'] = $field_name . '[' . $name . ']';
+						}
+
+						echo '<input ';
+						FrmAppHelper::array_to_html_params( $attrs, true );
+						$this->print_input_atts( compact( 'field', 'sub_field' ) );
+						echo '/>';
 				}
 
 				if ( $sub_field['label'] && ( $sub_field_desc || $this->should_print_hidden_sub_fields() ) ) {