← All changes | classes/models/FrmEmailSummary.php +4 -8 6.30 → 6.21 View file →

		@@ -2,9 +2,8 @@
2	2	/**
3	3	* Summary email base class
4	4	*
5	5	* @since 6.7
6		- *
7	6	* @package Formidable
8	7	*/
9	8
10	9	if ( ! defined( 'ABSPATH' ) ) {
		@@ -93,9 +92,8 @@
93	92	* @return false|string
94	93	*/
95	94	protected function get_content() {
96	95	$args = $this->get_content_args();
97		-
98	96	if ( false === $args ) {
99	97	return false;
100	98	}
101	99
		@@ -102,9 +100,11 @@
102	100	ob_start();
103	101	include $this->get_include_file( $this->template );
104	102	$content = ob_get_clean();
105	103
106		- return str_replace( '%%INNER_CONTENT%%', $this->get_inner_content(), $content );
	104	+ $content = str_replace( '%%INNER_CONTENT%%', $this->get_inner_content(), $content );
	105	+
	106	+ return $content;
107	107	}
108	108
109	109	/**
110	110	* Gets include file path from the given file name.
		@@ -109,9 +109,8 @@
109	109	/**
110	110	* Gets include file path from the given file name.
111	111	*
112	112	* @param string $file_name File name.
113		- *
114	113	* @return string
115	114	*/
116	115	protected function get_include_file( $file_name ) {
117	116	$suffix = $this->is_html ? '' : '-plain';
		@@ -177,9 +176,8 @@
177	176	return false;
178	177	}
179	178
180	179	$recipients = $this->get_recipients();
181		-
182	180	if ( ! $recipients ) {
183	181	// Return true to not try to send this email on the next day.
184	182	return true;
185	183	}
		@@ -184,17 +182,15 @@
184	182	return true;
185	183	}
186	184
187	185	$content = $this->get_content();
188		-
189	186	if ( false === $content ) {
190	187	return true;
191	188	}
192		-
193	189	$subject = $this->get_subject();
194	190	$headers = $this->get_headers();
195		- $sent = wp_mail( $recipients, $subject, $content, $headers );
196	191
	192	+ $sent = wp_mail( $recipients, $subject, $content, $headers );
197	193	if ( ! $sent ) {
198	194	$headers = implode( "\r\n", $headers );
199	195	$sent = mail( $recipients, $subject, $content, $headers );
200	196	}