← All changes | classes/models/fields/FrmFieldHTML.php +5 -24 6.34 → 6.2.1 View file →

		@@ -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
		@@ -24,9 +22,9 @@
24	22
25	23	/**
26	24	* @since 4.0
27	25	*
28		- * @param array $args Includes 'field', 'display', and 'values'.
	26	+ * @param array $args - Includes 'field', 'display', and 'values'
29	27	*
30	28	* @return void
31	29	*/
32	30	public function show_primary_options( $args ) {
		@@ -44,20 +42,18 @@
44	42	}
45	43
46	44	/**
47	45	* @since 3.0
48		- *
49		- * @param array $args
50		- * @param string $html
51		- *
52		- * @return string
53	46	*/
54	47	protected function after_replace_html_shortcodes( $args, $html ) {
55	48	FrmFieldsHelper::run_wpautop( array( 'wpautop' => true ), $html );
56	49	$pre_filter = $html;
57	50	$html = apply_filters( 'frm_get_default_value', $html, (object) $this->field, false );
	51	+ if ( $pre_filter === $html ) {
	52	+ $html = do_shortcode( $html );
	53	+ }
58	54
59		- return $pre_filter === $html ? do_shortcode( $html ) : $html;
	55	+ return $html;
60	56	}
61	57
62	58	/**
63	59	* @return string
		@@ -70,21 +66,6 @@
70	66	* @return string
71	67	*/
72	68	protected function include_form_builder_file() {
73	69	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	70	}
90	71	}