From 75917e25b3b5ad7bed8ed0c36433fb35c9ab33eb Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Tue, 23 Feb 2016 13:33:46 -0500
Subject: [PATCH] closes #4026

---
 src/emailer.js                                | 19 +++++--------------
 src/views/emails/digest.tpl                   |  2 +-
 src/views/emails/invitation.tpl               |  2 +-
 src/views/emails/notif_chat.tpl               |  2 +-
 src/views/emails/notif_post.tpl               |  2 +-
 .../emails/partials/footer_plaintext.tpl      |  2 --
 src/views/emails/registration_accepted.tpl    |  2 +-
 src/views/emails/reset.tpl                    |  2 +-
 src/views/emails/reset_notify.tpl             |  2 +-
 src/views/emails/test.tpl                     |  2 +-
 src/views/emails/welcome.tpl                  |  2 +-
 11 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 src/views/emails/partials/footer_plaintext.tpl

diff --git a/src/emailer.js b/src/emailer.js
index 522330f70b..34b5250908 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -140,20 +140,11 @@ var fallbackTransport;
 	}
 
 	function renderAndTranslate(tpl, params, lang, callback) {
-		async.waterfall([
-			function(next) {
-				render('emails/partials/footer' + (tpl.indexOf('_plaintext') !== -1 ? '_plaintext' : ''), params, next);
-			},
-			function(footer, next) {
-				params.footer = footer;
-				render(tpl, params, next);
-			},
-			function(html, next) {
-				translator.translate(html, lang, function(translated) {
-					next(null, translated);
-				});
-			}
-		], callback);
+		render(tpl, params, function(err, html) {
+			translator.translate(html, lang, function(translated) {
+				callback(err, translated);
+			});
+		});
 	}
 
 	function getHostname() {
diff --git a/src/views/emails/digest.tpl b/src/views/emails/digest.tpl
index 23677120de..23d20a89c9 100644
--- a/src/views/emails/digest.tpl
+++ b/src/views/emails/digest.tpl
@@ -42,7 +42,7 @@
 	<a href="{url}">[[email:digest.cta, {site_title}]]</a>
 </p>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->
 
 <hr />
 <p>
diff --git a/src/views/emails/invitation.tpl b/src/views/emails/invitation.tpl
index 7323a37d01..1b574dde08 100644
--- a/src/views/emails/invitation.tpl
+++ b/src/views/emails/invitation.tpl
@@ -8,4 +8,4 @@
 	<a href="{registerLink}">[[email:invitation.ctr]]</a>
 </blockquote>
 
-{footer}
\ No newline at end of file
+<!-- IMPORT emails/partials/footer.tpl -->
\ No newline at end of file
diff --git a/src/views/emails/notif_chat.tpl b/src/views/emails/notif_chat.tpl
index 13216a43c5..a0669f3bac 100644
--- a/src/views/emails/notif_chat.tpl
+++ b/src/views/emails/notif_chat.tpl
@@ -5,7 +5,7 @@
 
 <a href="{url}/chats/{fromUserslug}">[[email:notif.chat.cta]]</a>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->
 
 <hr />
 <p>
diff --git a/src/views/emails/notif_post.tpl b/src/views/emails/notif_post.tpl
index db870b1bc0..4fd360575f 100644
--- a/src/views/emails/notif_post.tpl
+++ b/src/views/emails/notif_post.tpl
@@ -5,7 +5,7 @@
 
 <a href="{url}">[[email:notif.post.cta]]</a>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->
 
 <hr />
 <p>
diff --git a/src/views/emails/partials/footer_plaintext.tpl b/src/views/emails/partials/footer_plaintext.tpl
deleted file mode 100644
index 1d2e2860dc..0000000000
--- a/src/views/emails/partials/footer_plaintext.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-[[email:closing]]
-{site_title}
diff --git a/src/views/emails/registration_accepted.tpl b/src/views/emails/registration_accepted.tpl
index 8975e33631..c025be0330 100644
--- a/src/views/emails/registration_accepted.tpl
+++ b/src/views/emails/registration_accepted.tpl
@@ -6,4 +6,4 @@
 
 <p>[[email:welcome.text3]]</p>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->
\ No newline at end of file
diff --git a/src/views/emails/reset.tpl b/src/views/emails/reset.tpl
index dc861a7d70..7e71d067a5 100644
--- a/src/views/emails/reset.tpl
+++ b/src/views/emails/reset.tpl
@@ -8,4 +8,4 @@
 	<a href="{reset_link}">[[email:reset.cta]]</a>
 </blockquote>
 
-{footer}
\ No newline at end of file
+<!-- IMPORT emails/partials/footer.tpl -->
\ No newline at end of file
diff --git a/src/views/emails/reset_notify.tpl b/src/views/emails/reset_notify.tpl
index 0f9da5beb1..0a825d3c31 100644
--- a/src/views/emails/reset_notify.tpl
+++ b/src/views/emails/reset_notify.tpl
@@ -4,4 +4,4 @@
 
 <p>[[email:reset.notify.text2]]</p>
 
-{footer}
\ No newline at end of file
+<!-- IMPORT emails/partials/footer.tpl -->
\ No newline at end of file
diff --git a/src/views/emails/test.tpl b/src/views/emails/test.tpl
index f46069fe20..75c1519ea1 100644
--- a/src/views/emails/test.tpl
+++ b/src/views/emails/test.tpl
@@ -2,4 +2,4 @@
 
 <p>[[email:test.text1]]</p>
 
-{footer}
\ No newline at end of file
+<!-- IMPORT emails/partials/footer.tpl -->
\ No newline at end of file
diff --git a/src/views/emails/welcome.tpl b/src/views/emails/welcome.tpl
index ed19359d08..c7a78c9056 100644
--- a/src/views/emails/welcome.tpl
+++ b/src/views/emails/welcome.tpl
@@ -10,4 +10,4 @@
 	<a href="{confirm_link}">[[email:welcome.cta]]</a>
 </blockquote>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->
\ No newline at end of file