← All changes | templates/emails/email-content.php +5 -3 4.4.1 → 4.4.6 View file →

		@@ -43,14 +43,16 @@
43	43	* Get global header and footer elements
44	44	*
45	45	* @since 4.1.0
46	46	*/
47		-$global_header_footer_elements = GlobalHeaderFooter::get_elements( $template );
	47	+$global_header_footer_elements = GlobalHeaderFooter::get_elements( $template );
	48	+$is_global_header_footer_template = ! empty( $template ) && 'yaymail_global_header_footer' === $template->get_name();
48	49
49	50	if ( ! empty( $template ) ) :
50	51	?>
51	52
52	53	<?php do_action( 'yaymail_before_email_content', $template, $render_data ); ?>
	54	+ <?php TemplateHelpers::render_email_preheader( $template, $args ); ?>
53	55	<table style="<?php echo esc_attr( $style_container_wrap ); ?>" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%">
54	56	<tr>
55	57	<td style="padding: 0;">
56	58	<table class="yaymail-template-content-container" style="width: 100%; max-width: <?php echo esc_attr( $container_width ); ?>px; margin: auto;border-spacing: 0;">
		@@ -57,15 +59,15 @@
57	59	<tr>
58	60	<td style="padding: 0;">
59	61	<table style="<?php echo esc_attr( $style_container ); ?>" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" class="yaymail-customizer-email-template-container <?php echo esc_attr( 'yaymail-template-' . $template->get_name() ); ?>">
60	62	<?php
61		- if ( ! empty( $global_header_footer_elements['global_header_elements'] ) ) {
	63	+ if ( ! $is_global_header_footer_template && ! empty( $global_header_footer_elements['global_header_elements'] ) && ! $template instanceof YayMail\YayMailPatternTemplate ) {
62	64	ElementsLoader::render_elements( $global_header_footer_elements['global_header_elements'], $args );
63	65	}
64	66	?>
65	67	<?php ElementsLoader::render_elements( $template->get_elements(), $args ); ?>
66	68	<?php
67		- if ( ! empty( $global_header_footer_elements['global_footer_elements'] ) ) {
	69	+ if ( ! $is_global_header_footer_template && ! empty( $global_header_footer_elements['global_footer_elements'] ) && ! $template instanceof YayMail\YayMailPatternTemplate ) {
68	70	ElementsLoader::render_elements( $global_header_footer_elements['global_footer_elements'], $args );
69	71	}
70	72	?>
71	73	</table>