← All changes | classes/models/fields/FrmFieldHTML.php +9 -4 6.25 → trunk View file →

		@@ -9,8 +9,9 @@
9	9	class FrmFieldHTML extends FrmFieldType {
10	10
11	11	/**
12	12	* @var string
	13	+ *
13	14	* @since 3.0
14	15	*/
15	16	protected $type = 'html';
16	17
		@@ -15,8 +16,9 @@
15	16	protected $type = 'html';
16	17
17	18	/**
18	19	* @var bool
	20	+ *
19	21	* @since 3.0
20	22	*/
21	23	protected $has_input = false;
22	24
		@@ -42,18 +44,20 @@
42	44	}
43	45
44	46	/**
45	47	* @since 3.0
	48	+ *
	49	+ * @param array $args
	50	+ * @param string $html
	51	+ *
	52	+ * @return string
46	53	*/
47	54	protected function after_replace_html_shortcodes( $args, $html ) {
48	55	FrmFieldsHelper::run_wpautop( array( 'wpautop' => true ), $html );
49	56	$pre_filter = $html;
50	57	$html = apply_filters( 'frm_get_default_value', $html, (object) $this->field, false );
51		- if ( $pre_filter === $html ) {
52		- $html = do_shortcode( $html );
53		- }
54	58
55		- return $html;
	59	+ return $pre_filter === $html ? do_shortcode( $html ) : $html;
56	60	}
57	61
58	62	/**
59	63	* @return string
		@@ -76,8 +80,9 @@
76	80	*
77	81	* @since 6.8.3
78	82	*
79	83	* @param array $atts
	84	+ *
80	85	* @return bool
81	86	*/
82	87	protected function should_strip_most_html_before_preparing_display_value( $atts ) {
83	88	return false;