| @@ -18,9 +18,9 @@ | ||
| 18 | 18 | if ($field['field'] == 'Select2') { |
| 19 | 19 | wp_enqueue_script('wppb_sl2_lib_js', WPPB_PLUGIN_URL . 'assets/js/select2/select2.min.js', array('jquery')); |
| 20 | 20 | wp_enqueue_style('wppb_sl2_lib_css', WPPB_PLUGIN_URL . 'assets/css/select2/select2.min.css'); |
| 21 | 21 | |
| 22 | - wp_enqueue_script( 'wppb_sl2_js', WPPB_PLUGIN_URL.'front-end/default-fields/select2/select2.js', array('jquery'), PROFILE_BUILDER_VERSION, true ); | |
| 22 | + wp_enqueue_script( 'wppb_sl2_js', WPPB_PLUGIN_URL.'front-end/default-fields/select2/select2.js', array('jquery', 'wp-hooks'), PROFILE_BUILDER_VERSION, true ); | |
| 23 | 23 | wp_enqueue_style( 'wppb_sl2_css', WPPB_PLUGIN_URL.'front-end/default-fields/select2/select2.css', false, PROFILE_BUILDER_VERSION ); |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | $field['labels'] = apply_filters('wppb_select2_labels', $field['labels'], $form_location, $field, $user_id, $field_check_errors, $request_data); |
| @@ -52,10 +52,10 @@ | ||
| 52 | 52 | if (array_key_exists($field['id'], $field_check_errors)) |
| 53 | 53 | $error_mark = '<img src="' . WPPB_PLUGIN_URL . 'assets/images/pencil_delete.png" title="' . wppb_required_field_error($field["field-title"]) . '"/>'; |
| 54 | 54 | |
| 55 | 55 | $output = ' |
| 56 | - <label for="' . esc_attr($field['meta-name']) . '">' . $item_title . $error_mark . '</label> | |
| 57 | - <select name="' . esc_attr($field['meta-name']) . '" id="' . esc_attr($field['meta-name']) . '" class="custom_field_select2" ' . $extra_attr . ' data-wppb-select2-arguments=\'' . json_encode($arguments) . '\'>'; | |
| 56 | + <label for="' . esc_attr(wppb_handle_meta_name($field['meta-name'])) . '">' . $item_title . $error_mark . '</label> | |
| 57 | + <select name="' . esc_attr($field['meta-name']) . '" id="' . esc_attr(wppb_handle_meta_name($field['meta-name'])) . '" class="custom_field_select2" ' . $extra_attr . ' data-wppb-select2-arguments=\'' . json_encode($arguments) . '\'>'; | |
| 58 | 58 | |
| 59 | 59 | $extra_select_option = apply_filters('wppb_extra_select_option', '', $field, $item_title); |
| 60 | 60 | if (!empty($extra_select_option)) { |
| 61 | 61 | $output .= $extra_select_option; |
| @@ -79,11 +79,11 @@ | ||
| 79 | 79 | $item_title = (($field['required'] == 'Yes') ? $item_title . ' <span class="description">(' . __('required', 'profile-builder') . ')</span>' : $item_title); |
| 80 | 80 | $output = ' |
| 81 | 81 | <table class="form-table"> |
| 82 | 82 | <tr> |
| 83 | - <th><label for="' . esc_attr($field['meta-name']) . '">' . $item_title . '</label></th> | |
| 83 | + <th><label for="' . esc_attr(wppb_handle_meta_name($field['meta-name'])) . '">' . $item_title . '</label></th> | |
| 84 | 84 | <td> |
| 85 | - <select name="' . esc_attr($field['meta-name']) . '" class="custom_field_select2 wppb-select2" id="' . esc_attr($field['meta-name']) . '" ' . $extra_attr . ' data-wppb-select2-arguments=\'' . json_encode($arguments) . '\'>'; | |
| 85 | + <select name="' . esc_attr($field['meta-name']) . '" class="custom_field_select2 wppb-select2" id="' . esc_attr(wppb_handle_meta_name($field['meta-name'])) . '" ' . $extra_attr . ' data-wppb-select2-arguments=\'' . json_encode($arguments) . '\'>'; | |
| 86 | 86 | |
| 87 | 87 | foreach ($select2_values as $key => $value) { |
| 88 | 88 | $output .= '<option value="' . esc_attr(trim($value)) . '" class="custom_field_select2_option" '; |
| 89 | 89 | |
