From 00e6f4bb3401f598d4b90e714f4c6899bc9f973f Mon Sep 17 00:00:00 2001 From: Matt Hanley Date: Wed, 4 May 2022 10:22:19 +0100 Subject: [PATCH] Removed from-address fallback to members_from_address setting refs https://github.com/TryGhost/Team/issues/1558 - `members_from_address` is no longer configurable in Admin but was still used as a fallback - This change removes the fallback so we default straight to noreply@ when a from-address isn't set for a newsletter --- core/server/services/members/config.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/server/services/members/config.js b/core/server/services/members/config.js index cc177ee8ec..5445308289 100644 --- a/core/server/services/members/config.js +++ b/core/server/services/members/config.js @@ -35,13 +35,8 @@ class MembersConfigProvider { } getEmailFromAddress() { - const fromAddress = this._settingsCache.get('members_from_address') || 'noreply'; - - // Any fromAddress without domain uses site domain, like default setting `noreply` - if (fromAddress.indexOf('@') < 0) { - return `${fromAddress}@${this._getDomain()}`; - } - return fromAddress; + // Individual from addresses are set per newsletter - this is the fallback address + return `noreply@${this._getDomain()}`; } getEmailSupportAddress() {