← All changes | classes/models/FrmEntryShortcodeFormatter.php +4 -14 6.26 → 6.8 View file →

		@@ -9,9 +9,8 @@
9	9	class FrmEntryShortcodeFormatter {
10	10
11	11	/**
12	12	* @var int
13		- *
14	13	* @since 2.04
15	14	*/
16	15	protected $form_id = 0;
17	16
		@@ -16,9 +15,8 @@
16	15	protected $form_id = 0;
17	16
18	17	/**
19	18	* @var array
20		- *
21	19	* @since 2.04
22	20	*/
23	21	protected $skip_fields = array( 'captcha', 'html' );
24	22
		@@ -23,9 +21,8 @@
23	21	protected $skip_fields = array( 'captcha', 'html' );
24	22
25	23	/**
26	24	* @var array
27		- *
28	25	* @since 3.0
29	26	*/
30	27	protected $single_cell_fields = array( 'html' );
31	28
		@@ -30,9 +27,8 @@
30	27	protected $single_cell_fields = array( 'html' );
31	28
32	29	/**
33	30	* @var array
34		- *
35	31	* @since 2.04
36	32	*/
37	33	protected $fields = array();
38	34
		@@ -37,9 +33,8 @@
37	33	protected $fields = array();
38	34
39	35	/**
40	36	* @var bool
41		- *
42	37	* @since 2.05
43	38	*/
44	39	protected $is_plain_text = false;
45	40
		@@ -44,23 +39,20 @@
44	39	protected $is_plain_text = false;
45	40
46	41	/**
47	42	* @var string
48		- *
49	43	* @since 2.04
50	44	*/
51	45	protected $format = 'text';
52	46
53	47	/**
54		- * @var FrmTableHTMLGenerator|null
55		- *
	48	+ * @var FrmTableHTMLGenerator
56	49	* @since 2.04
57	50	*/
58		- protected $table_generator;
	51	+ protected $table_generator = null;
59	52
60	53	/**
61	54	* @var array
62		- *
63	55	* @since 2.04
64	56	*/
65	57	protected $array_content = array();
66	58
		@@ -160,10 +152,8 @@
160	152	/**
161	153	* Return the default HTML for an entry
162	154	*
163	155	* @since 2.04
164		- *
165		- * @return array|string
166	156	*/
167	157	public function content() {
168	158	if ( ! $this->form_id || empty( $this->fields ) ) {
169	159	return '';
		@@ -168,9 +158,9 @@
168	158	if ( ! $this->form_id || empty( $this->fields ) ) {
169	159	return '';
170	160	}
171	161
172		- if ( $this->format === 'array' ) {
	162	+ if ( $this->format == 'array' ) {
173	163	$content = $this->get_array();
174	164	} elseif ( $this->is_plain_text_format() ) {
175	165	$content = $this->get_plain_text();
176	166	} else {
		@@ -213,9 +203,9 @@
213	203	*
214	204	* @return string
215	205	*/
216	206	protected function get_table() {
217		- $content = $this->table_generator->generate_table_header();
	207	+ $content = $this->table_generator->generate_table_header();
218	208	$content .= $this->generate_content_for_all_fields();
219	209	$content .= $this->table_generator->generate_table_footer();
220	210
221	211	return $content;