Merge pull request #659 from warpc/652-mailer_urls

[refs #652] https link in email if service use https
2012-09-24 08:50:50 -07:00 · 2012-09-24 08:50:50 -07:00 · 29ab62748d
parent 3c70adba9a eaf71f9cc0
commit 29ab62748d
2 changed files with 2 additions and 0 deletions
--- a/app/mailers/feedback_mailer.rb
+++ b/app/mailers/feedback_mailer.rb
@ -4,6 +4,7 @@ class FeedbackMailer < ActionMailer::Base
  default :to  => FBM_CONFIG['email'],
          :cc  => FBM_CONFIG['cc'],
          :bcc => FBM_CONFIG['bcc']
+  default_url_options.merge!(:protocol => 'https') if APP_CONFIG['mailer_https_url']

  include Resque::Mailer # send email async

--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@ -2,6 +2,7 @@

 class UserMailer < ActionMailer::Base
  default :from => APP_CONFIG['do-not-reply-email']
+  default_url_options.merge!(:protocol => 'https') if APP_CONFIG['mailer_https_url']

  include Resque::Mailer # send email async