don't raise if campaign monitor fails

fiverr · Apr 29, 2010 · b602943 · b602943
1 parent 5fde675
commit b602943
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
@@ -3,7 +3,7 @@ class SubscriptionsController < ApplicationController
   def create
     if params[:subscription] and email = params[:subscription][:email]
       subscriber = Campaigning::Subscriber.new(self.email, nil)
-      subscriber.add_and_resubscribe!(CAMPAIGN_MONITOR_LIST_ID)
+      subscriber.add_and_resubscribe!(CAMPAIGN_MONITOR_LIST_ID) rescue nil
       flash[:notice] = 'Thank you for subscribing to our newsletter.'
       redirect_to :back
     else

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -65,7 +65,7 @@ def deliver_password_reset_instructions!
     reset_perishable_token!
     Notifier.deliver_password_reset_instructions(self)
   end
-  
+
 private
 
   def manage_newsletter_subscription
@@ -80,13 +80,13 @@ def manage_newsletter_subscription
 
   def subscribe_to_newsletter
     subscriber = Campaigning::Subscriber.new(self.email, self.name)
-    subscriber.add_and_resubscribe!(CAMPAIGN_MONITOR_LIST_ID)
+    subscriber.add_and_resubscribe!(CAMPAIGN_MONITOR_LIST_ID) rescue nil
     true
   end
 
   def unsubscribe_from_newsletter
     subscriber = Campaigning::Subscriber.new(self.email)
-    subscriber.unsubscribe!(CAMPAIGN_MONITOR_LIST_ID)
+    subscriber.unsubscribe!(CAMPAIGN_MONITOR_LIST_ID) rescue nil
     true
   end