maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove check for blank mailchimp newsletter ID (#13966)

Browse source
This commit is contained in:
Andy Zhao 2021-06-14 12:07:02 -04:00 • committed by GitHub
parent 8158ea3cd2
commit ffc0bcd345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -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