← All changes
|
classes/views/frm-fields/front-end/combo-field/combo-field.php
+13
-16
6.4.2
→
trunk
View file →
| @@ -2,8 +2,9 @@ | ||
| 2 | 2 | /** |
| 3 | 3 | * Frontend template for combo field |
| 4 | 4 | * |
| 5 | 5 | * @package Formidable |
| 6 | + * | |
| 6 | 7 | * @since 4.10.02 |
| 7 | 8 | * |
| 8 | 9 | * @var array $args Data passed to this view. See FrmFieldCombo::load_field_output(). |
| 9 | 10 | * @var array $shortcode_atts Shortcode attributes. |
| @@ -56,33 +57,29 @@ | ||
| 56 | 57 | |
| 57 | 58 | <?php |
| 58 | 59 | switch ( $sub_field['type'] ) { |
| 59 | 60 | default: |
| 60 | - ?> | |
| 61 | - <input | |
| 62 | - type="<?php echo esc_attr( $sub_field['type'] ); ?>" | |
| 63 | - id="<?php echo esc_attr( $html_id . '_' . $name ); ?>" | |
| 64 | - value="<?php echo esc_attr( isset( $field_value[ $name ] ) ? $field_value[ $name ] : '' ); ?>" | |
| 65 | - <?php | |
| 66 | - if ( empty( $args['remove_names'] ) ) { | |
| 67 | - echo 'name="' . esc_attr( $field_name ) . '[' . esc_attr( $name ) . ']" '; | |
| 68 | - } | |
| 61 | + $attrs = $this->get_sub_field_input_attrs( $sub_field, $args ); | |
| 69 | 62 | |
| 70 | - $this->print_input_atts( compact( 'field', 'sub_field' ) ); | |
| 71 | - ?> | |
| 72 | - /> | |
| 73 | - <?php | |
| 63 | + echo '<input '; | |
| 64 | + FrmAppHelper::array_to_html_params( $attrs, true ); | |
| 65 | + $this->print_input_atts( compact( 'field', 'sub_field' ) ); | |
| 66 | + echo '/>'; | |
| 74 | 67 | } |
| 75 | 68 | |
| 76 | 69 | if ( $sub_field['label'] && ( $sub_field_desc || $this->should_print_hidden_sub_fields() ) ) { |
| 77 | - echo '<div class="frm_description" id="frm_field_' . esc_attr( $field_id . '_' . $sub_field['name'] ) . '_desc">' . FrmAppHelper::kses( $sub_field_desc ) . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 70 | + echo '<div class="frm_description" id="frm_field_' . esc_attr( $field_id . '_' . $sub_field['name'] ) . '_desc">'; | |
| 71 | + FrmAppHelper::kses_echo( $sub_field_desc ); | |
| 72 | + echo '</div>'; | |
| 78 | 73 | } |
| 79 | 74 | |
| 80 | 75 | // Don't show individual field errors when there is a combo field error. |
| 81 | - if ( ! empty( $errors ) && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) { | |
| 76 | + if ( $errors && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) { | |
| 82 | 77 | ?> |
| 83 | 78 | <div class="frm_error" role="alert"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div> |
| 84 | 79 | <?php } ?> |
| 85 | 80 | </div> |
| 86 | - <?php } ?> | |
| 81 | + <?php | |
| 82 | + }//end foreach | |
| 83 | + ?> | |
| 87 | 84 | </div> |
| 88 | 85 | </fieldset> |