From 0665844500ade80569b846f4d79c0dd9f2c93657 Mon Sep 17 00:00:00 2001 From: Jordan Hansen Date: Mon, 6 Apr 2015 21:19:15 -0600 Subject: [PATCH 1/2] Fix empty emails --- Gemfile | 1 + app/models/forem/subscription.rb | 2 +- spec/models/subscription_spec.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index ea5de6278..23c0998ac 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,7 @@ gemspec gem 'pry-rails' gem 'pry-nav' gem 'select2-rails', '~> 3.5.4' +gem 'tzinfo-data' platforms :jruby do gem "activerecord-jdbc-adapter", :require => false diff --git a/app/models/forem/subscription.rb b/app/models/forem/subscription.rb index 9551d14b7..0e26be8c2 100644 --- a/app/models/forem/subscription.rb +++ b/app/models/forem/subscription.rb @@ -8,7 +8,7 @@ class Subscription < ActiveRecord::Base def send_notification(post_id) # If a user cannot be found, then no-op # This will happen if the user record has been deleted. - if subscriber.present? + if subscriber.present? && subscriber.email SubscriptionMailer.topic_reply(post_id, subscriber.id).deliver end end diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb index 679bcfa78..cbb75185d 100644 --- a/spec/models/subscription_spec.rb +++ b/spec/models/subscription_spec.rb @@ -24,7 +24,7 @@ end # Regression test for #375 - it "does not send a notification when user is missing" do + it "does not send a notification when user is missing or if there is no email address" do subscription = Forem::Subscription.new Forem::SubscriptionMailer.should_not_receive(:topic_reply) subscription.send_notification(1) From 0b4d158c1b83ed0bd73e2d3273e7b6077b588ee9 Mon Sep 17 00:00:00 2001 From: Jordan Hansen Date: Tue, 7 Apr 2015 06:01:03 -0600 Subject: [PATCH 2/2] Fix empty emails --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index 23c0998ac..ea5de6278 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ gemspec gem 'pry-rails' gem 'pry-nav' gem 'select2-rails', '~> 3.5.4' -gem 'tzinfo-data' platforms :jruby do gem "activerecord-jdbc-adapter", :require => false