From be7d7a135661fb505e1c16969c179df226009c1f Mon Sep 17 00:00:00 2001
From: Garrett Hyder <garrett@eclipsecreative.ca>
Date: Thu, 7 Apr 2016 09:49:29 -0700
Subject: [PATCH 1/2] Introduced the %subject% as an available tag on the Email
 Template

---
 wpbe.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wpbe.php b/wpbe.php
index b620920..759fb40 100644
--- a/wpbe.php
+++ b/wpbe.php
@@ -357,12 +357,15 @@ function ajax_send_preview( $email ) {
 		 */
 		function template_vars_replacement( $template ) {
 
+			global $phpmailer;
+
 			$to_replace = array(
 				'blog_url'         => get_option( 'siteurl' ),
 				'home_url'         => get_option( 'home' ),
 				'blog_name'        => get_option( 'blogname' ),
 				'blog_description' => get_option( 'blogdescription' ),
 				'admin_email'      => get_option( 'admin_email' ),
+				'subject'          => $phpmailer->Subject,
 				'date'             => date_i18n( get_option( 'date_format' ) ),
 				'time'             => date_i18n( get_option( 'time_format' ) )
 			);
@@ -391,7 +394,7 @@ function check_template() {
 		/**
 		 * Add the template to the message body.
 		 *
-		 * Looks for %message% into the template and replaces it with the message.
+		 * Looks for %subject% and %content% in the template and replaces them appropriately.
 		 *
 		 * @since 0.1
 		 * @param string $body The message to templatize
@@ -586,6 +589,7 @@ function contextual_help( $contextual_help, $screen_id, $screen ) {
 
 			return '<p>' . __( 'Some dynamic tags can be included in your email template :', 'wp-better-emails' ) . '</p>
 					<ul>
+						<li>' . __( '<strong>%subject%</strong> : will be replaced with the emails Subject.', 'wp-better-emails' ) . '</li>
 						<li>' . __( '<strong>%content%</strong> : will be replaced with the message content.', 'wp-better-emails' ) . '<br />
 						<span class="description"> ' . __( 'NOTE: The content tag is <strong>required</strong>, WP Better Emails will be automatically desactivated if no content tag is found.', 'wp-better-emails' ) . '</span></li>
 						<li>' . __( '<strong>%blog_url%</strong> : will be replaced with your blog URL.', 'wp-better-emails' ) . '</li>

From a76b38327f56b599fa400b6676a3a2715c51bf4c Mon Sep 17 00:00:00 2001
From: Garrett Hyder <garrett@eclipsecreative.ca>
Date: Thu, 7 Apr 2016 10:08:47 -0700
Subject: [PATCH 2/2] Introduced the Help Tab content ad a new Help Tab to
 avoid plugin conflicts. #18

---
 wpbe.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/wpbe.php b/wpbe.php
index 759fb40..99874f1 100644
--- a/wpbe.php
+++ b/wpbe.php
@@ -587,7 +587,7 @@ function contextual_help( $contextual_help, $screen_id, $screen ) {
 				return $contextual_help;
 			}
 
-			return '<p>' . __( 'Some dynamic tags can be included in your email template :', 'wp-better-emails' ) . '</p>
+			$help_content = '<p>' . __( 'Some dynamic tags can be included in your email template :', 'wp-better-emails' ) . '</p>
 					<ul>
 						<li>' . __( '<strong>%subject%</strong> : will be replaced with the emails Subject.', 'wp-better-emails' ) . '</li>
 						<li>' . __( '<strong>%content%</strong> : will be replaced with the message content.', 'wp-better-emails' ) . '<br />
@@ -600,6 +600,15 @@ function contextual_help( $contextual_help, $screen_id, $screen ) {
 						<li>' . __( '<strong>%date%</strong> : will be replaced with current date, as formatted in <a href="options-general.php">general options</a>.', 'wp-better-emails' ) . '</li>
 						<li>' . __( '<strong>%time%</strong> : will be replaced with current time, as formatted in <a href="options-general.php">general options</a>.', 'wp-better-emails' ) . '</li>
 					</ul>';
+
+		    $screen->add_help_tab( array(
+		        'id'      => 'help-wp-better-emails',
+		        'title'   => 'Template Tags',
+		        'content' => $help_content,
+		    ));
+
+		    return $contextual_help;
+
 		}
 
 		/**