← All changes
|
admin/views/sp-framework/fields/select/select.php
+13
-18
2.3.6
→
2.2.10
View file →
| @@ -44,9 +44,9 @@ | ||
| 44 | 44 | ); |
| 45 | 45 | |
| 46 | 46 | $this->value = ( is_array( $this->value ) ) ? $this->value : array_filter( (array) $this->value ); |
| 47 | 47 | |
| 48 | - echo wp_kses_post( $this->field_before() ); | |
| 48 | + echo $this->field_before(); | |
| 49 | 49 | |
| 50 | 50 | if ( isset( $this->field['options'] ) ) { |
| 51 | 51 | |
| 52 | 52 | if ( ! empty( $args['ajax'] ) ) { |
| @@ -66,60 +66,55 @@ | ||
| 66 | 66 | $field_class = ( $args['chosen'] ) ? ' class="spf-chosen' . $chosen_rtl . $chosen_sortable . $chosen_ajax . '"' : ''; |
| 67 | 67 | $field_name = $this->field_name( $multiple_name ); |
| 68 | 68 | $field_attr = $this->field_attributes(); |
| 69 | 69 | $maybe_options = $this->field['options']; |
| 70 | - $field_unique = $this->unique; | |
| 70 | + $field_unique = $this->unique; | |
| 71 | 71 | $chosen_data_attr = ( $args['chosen'] && ! empty( $args['settings'] ) ) ? ' data-chosen-settings="' . esc_attr( json_encode( $args['settings'] ) ) . '"' : ''; |
| 72 | 72 | if ( is_string( $maybe_options ) && ! empty( $args['chosen'] ) && ! empty( $args['ajax'] ) ) { |
| 73 | 73 | $options = $this->field_wp_query_data_title( $maybe_options, $this->value ); |
| 74 | 74 | } elseif ( is_string( $maybe_options ) ) { |
| 75 | - $options = $this->field_data( $maybe_options, false, $args['query_args'], $field_unique ); | |
| 75 | + $options = $this->field_data( $maybe_options, false, $args['query_args'], $field_unique); | |
| 76 | 76 | } else { |
| 77 | 77 | $options = $maybe_options; |
| 78 | 78 | } |
| 79 | - if ( ( is_array( $options ) && ! empty( $options ) ) || ( ! empty( $args['chosen'] ) && ! empty( $args['ajax'] ) ) ) { | |
| 79 | + if( ( is_array( $options ) && ! empty( $options ) ) || ( ! empty( $args['chosen'] ) && ! empty( $args['ajax'] ) ) ) { | |
| 80 | 80 | if ( ! empty( $args['chosen'] ) && ! empty( $args['multiple'] ) ) { |
| 81 | - echo '<select name="' . esc_attr( $field_name ) . '" class="spf-hidden-select spf-hidden"' . wp_kses_post( $multiple_attr . $field_attr ) . '>'; | |
| 81 | + echo '<select name="' . $field_name . '" class="spf-hidden-select spf-hidden"' . $multiple_attr . $field_attr . '>'; | |
| 82 | 82 | foreach ( $this->value as $option_key ) { |
| 83 | - echo '<option value="' . esc_attr( $option_key ) . '" selected>' . esc_html( $option_key ) . '</option>'; | |
| 83 | + echo '<option value="' . $option_key . '" selected>' . $option_key . '</option>'; | |
| 84 | 84 | } |
| 85 | 85 | echo '</select>'; |
| 86 | 86 | $field_name = '_pseudo'; |
| 87 | 87 | $field_attr = ''; |
| 88 | 88 | } |
| 89 | - echo '<select name="' . esc_attr( $field_name ) . '"' . wp_kses_post( $field_class . $multiple_attr . $placeholder_attr . $field_attr . $chosen_data_attr ) . '>'; | |
| 89 | + echo '<select name="' . $field_name . '"' . $field_class . $multiple_attr . $placeholder_attr . $field_attr . $chosen_data_attr . '>'; | |
| 90 | 90 | if ( $args['placeholder'] && empty( $args['multiple'] ) ) { |
| 91 | 91 | if ( ! empty( $args['chosen'] ) ) { |
| 92 | 92 | echo '<option value=""></option>'; |
| 93 | 93 | } else { |
| 94 | - echo '<option value="">' . esc_html( $args['placeholder'] ) . '</option>'; | |
| 94 | + echo '<option value="">' . $args['placeholder'] . '</option>'; | |
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | foreach ( $options as $option_key => $option ) { |
| 98 | 98 | if ( is_array( $option ) && ! empty( $option ) ) { |
| 99 | - echo '<optgroup label="' . esc_attr( $option_key ) . '">'; | |
| 99 | + echo '<optgroup label="' . $option_key . '">'; | |
| 100 | 100 | foreach ( $option as $sub_key => $sub_value ) { |
| 101 | 101 | $selected = ( in_array( $sub_key, $this->value ) ) ? ' selected' : ''; |
| 102 | - echo '<option value="' . esc_attr( $sub_key ) . '" ' . esc_attr( $selected ) . '>' . wp_kses_post( $sub_value ) . '</option>'; | |
| 102 | + echo '<option value="' . $sub_key . '" ' . $selected . '>' . $sub_value . '</option>'; | |
| 103 | 103 | } |
| 104 | 104 | echo '</optgroup>'; |
| 105 | 105 | } else { |
| 106 | 106 | $selected = ( in_array( $option_key, $this->value ) ) ? ' selected' : ''; |
| 107 | - echo '<option value="' . esc_attr( $option_key ) . '" ' . esc_attr( $selected ) . '>' . wp_kses_post( $option ) . '</option>'; | |
| 107 | + echo '<option value="' . $option_key . '" ' . $selected . '>' . $option . '</option>'; | |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | echo '</select>'; |
| 111 | 111 | } else { |
| 112 | - echo ( esc_html( ! empty( $this->field['empty_message'] ) ) ) ? esc_html( $this->field['empty_message'] ) : esc_html__( 'No data provided for this option type.', 'smart-post-show' ); | |
| 112 | + echo ( ! empty( $this->field['empty_message'] ) ) ? $this->field['empty_message'] : esc_html__( 'No data provided for this option type.', 'smart-post-show' ); | |
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | - echo wp_kses_post( $this->field_after() ); | |
| 115 | + echo $this->field_after(); | |
| 116 | 116 | } |
| 117 | - /** | |
| 118 | - * Enqueue UI Sortable. | |
| 119 | - * | |
| 120 | - * @return void | |
| 121 | - */ | |
| 122 | 117 | public function enqueue() { |
| 123 | 118 | if ( ! wp_script_is( 'jquery-ui-sortable' ) ) { |
| 124 | 119 | wp_enqueue_script( 'jquery-ui-sortable' ); |
| 125 | 120 | } |