diff --git a/app/models/event.rb b/app/models/event.rb index 78d7e5d4..f40c86b4 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -132,7 +132,7 @@ class Event < ActiveRecord::Base end def process_acceptance(options) - if self.conference.email_settings.send_on_accepted && + if conference.email_settings.send_on_accepted && options[:send_mail].blank? Rails.logger.debug 'Sending event acceptance mail' Mailbot.acceptance_mail(self).deliver @@ -140,7 +140,7 @@ class Event < ActiveRecord::Base end def process_rejection(options) - if self.conference.email_settings.send_on_rejected && + if conference.email_settings.send_on_rejected && options[:send_mail].blank? Rails.logger.debug 'Sending rejected mail' Mailbot.rejection_mail(self).deliver