From ffc0bcd3451a8be6c85faf2879dbe941a2a31dae Mon Sep 17 00:00:00 2001
From: Andy Zhao <17884966+Zhao-Andy@users.noreply.github.com>
Date: Mon, 14 Jun 2021 12:07:02 -0400
Subject: [PATCH] Remove check for blank mailchimp newsletter ID (#13966)

---
 app/models/user.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index f26b36400..5424a307a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -546,7 +546,7 @@ class User < ApplicationRecord
 
   def subscribe_to_mailchimp_newsletter
     return unless registered && email.present?
-    return if Settings::General.mailchimp_api_key.blank? && Settings::General.mailchimp_newsletter_id.blank?
+    return if Settings::General.mailchimp_api_key.blank?
     return if saved_changes.key?(:unconfirmed_email) && saved_changes.key?(:confirmation_sent_at)
     return unless saved_changes.key?(:email) || saved_changes.key?(:email_newsletter)
 
@@ -574,7 +574,7 @@ class User < ApplicationRecord
 
   def unsubscribe_from_newsletters
     return if email.blank?
-    return if Settings::General.mailchimp_api_key.blank? && Settings::General.mailchimp_newsletter_id.blank?
+    return if Settings::General.mailchimp_api_key.blank?
 
     Mailchimp::Bot.new(self).unsubscribe_all_newsletters
   end