From 8d62ead329f22c136fa83383e22b580847db36f0 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 25 Mar 2019 12:37:48 -0400
Subject: [PATCH] fix: #7469 missing email logos, occasionally

---
 src/emailer.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/emailer.js b/src/emailer.js
index b74e132153..b72babbdfe 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -162,9 +162,15 @@ Emailer.registerApp = function (expressApp) {
 	// Update default payload if new logo is uploaded
 	pubsub.on('config:update', function (config) {
 		if (config) {
-			Emailer._defaultPayload.logo.src = config['brand:emailLogo'];
-			Emailer._defaultPayload.logo.height = config['brand:emailLogo:height'];
-			Emailer._defaultPayload.logo.width = config['brand:emailLogo:width'];
+			if (config['brand:emailLogo']) {
+				Emailer._defaultPayload.logo.src = config['brand:emailLogo'];
+			}
+			if (config['brand:emailLogo:height']) {
+				Emailer._defaultPayload.logo.height = config['brand:emailLogo:height'];
+			}
+			if (config['brand:emailLogo:width']) {
+				Emailer._defaultPayload.logo.width = config['brand:emailLogo:width'];
+			}
 
 			if (smtpSettingsChanged(config)) {
 				Emailer.setupFallbackTransport(config);