closes #4026

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() {

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>

src/views/emails/invitation.tpl

@@ -8,4 +8,4 @@
 	<a href="{registerLink}">[[email:invitation.ctr]]</a>
 </blockquote>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->

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>

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>

src/views/emails/partials/footer_plaintext.tpl

@@ -1,2 +0,0 @@
-[[email:closing]]
-{site_title}

src/views/emails/registration_accepted.tpl

@@ -6,4 +6,4 @@
 
 <p>[[email:welcome.text3]]</p>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->

src/views/emails/reset.tpl

@@ -8,4 +8,4 @@
 	<a href="{reset_link}">[[email:reset.cta]]</a>
 </blockquote>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->

src/views/emails/reset_notify.tpl

@@ -4,4 +4,4 @@
 
 <p>[[email:reset.notify.text2]]</p>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->

src/views/emails/test.tpl

@@ -2,4 +2,4 @@
 
 <p>[[email:test.text1]]</p>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->

src/views/emails/welcome.tpl

@@ -10,4 +10,4 @@
 	<a href="{confirm_link}">[[email:welcome.cta]]</a>
 </blockquote>
 
-{footer}
+<!-- IMPORT emails/partials/footer.tpl -->