| @@ -9,9 +9,8 @@ | ||
| 9 | 9 | class FrmFieldHTML extends FrmFieldType { |
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * @var string |
| 13 | - * | |
| 14 | 13 | * @since 3.0 |
| 15 | 14 | */ |
| 16 | 15 | protected $type = 'html'; |
| 17 | 16 | |
| @@ -16,9 +15,8 @@ | ||
| 16 | 15 | protected $type = 'html'; |
| 17 | 16 | |
| 18 | 17 | /** |
| 19 | 18 | * @var bool |
| 20 | - * | |
| 21 | 19 | * @since 3.0 |
| 22 | 20 | */ |
| 23 | 21 | protected $has_input = false; |
| 24 | 22 | |
| @@ -23,23 +21,17 @@ | ||
| 23 | 21 | protected $has_input = false; |
| 24 | 22 | |
| 25 | 23 | /** |
| 26 | 24 | * @since 4.0 |
| 27 | - * | |
| 28 | - * @param array $args Includes 'field', 'display', and 'values'. | |
| 29 | - * | |
| 30 | - * @return void | |
| 25 | + * @param array $args - Includes 'field', 'display', and 'values' | |
| 31 | 26 | */ |
| 32 | 27 | public function show_primary_options( $args ) { |
| 33 | 28 | $field = $args['field']; |
| 34 | - include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/html-content.php'; | |
| 29 | + include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/html-content.php' ); | |
| 35 | 30 | |
| 36 | 31 | parent::show_primary_options( $args ); |
| 37 | 32 | } |
| 38 | 33 | |
| 39 | - /** | |
| 40 | - * @return string | |
| 41 | - */ | |
| 42 | 34 | public function default_html() { |
| 43 | 35 | return '<div id="frm_field_[id]_container" class="frm_form_field form-field">[description]</div>'; |
| 44 | 36 | } |
| 45 | 37 | |
| @@ -44,47 +36,24 @@ | ||
| 44 | 36 | } |
| 45 | 37 | |
| 46 | 38 | /** |
| 47 | 39 | * @since 3.0 |
| 48 | - * | |
| 49 | - * @param array $args | |
| 50 | - * @param string $html | |
| 51 | - * | |
| 52 | - * @return string | |
| 53 | 40 | */ |
| 54 | 41 | protected function after_replace_html_shortcodes( $args, $html ) { |
| 55 | 42 | FrmFieldsHelper::run_wpautop( array( 'wpautop' => true ), $html ); |
| 56 | 43 | $pre_filter = $html; |
| 57 | 44 | $html = apply_filters( 'frm_get_default_value', $html, (object) $this->field, false ); |
| 45 | + if ( $pre_filter === $html ) { | |
| 46 | + $html = do_shortcode( $html ); | |
| 47 | + } | |
| 58 | 48 | |
| 59 | - return $pre_filter === $html ? do_shortcode( $html ) : $html; | |
| 49 | + return $html; | |
| 60 | 50 | } |
| 61 | 51 | |
| 62 | - /** | |
| 63 | - * @return string | |
| 64 | - */ | |
| 65 | 52 | public function get_container_class() { |
| 66 | 53 | return ' frm_html_container'; |
| 67 | 54 | } |
| 68 | 55 | |
| 69 | - /** | |
| 70 | - * @return string | |
| 71 | - */ | |
| 72 | 56 | protected function include_form_builder_file() { |
| 73 | 57 | return FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/field-html.php'; |
| 74 | - } | |
| 75 | - | |
| 76 | - /** | |
| 77 | - * Overwrite FrmFieldType::should_strip_most_html_before_preparing_display_value. | |
| 78 | - * An HTML field is not populated from user input. | |
| 79 | - * It does not need to be passed through FrmAppHelper::strip_most_html. | |
| 80 | - * | |
| 81 | - * @since 6.8.3 | |
| 82 | - * | |
| 83 | - * @param array $atts | |
| 84 | - * | |
| 85 | - * @return bool | |
| 86 | - */ | |
| 87 | - protected function should_strip_most_html_before_preparing_display_value( $atts ) { | |
| 88 | - return false; | |
| 89 | 58 | } |
| 90 | 59 | } |