[refs #652] set url options for mailer

This commit is contained in:
Alexander Machehin 2012-09-24 19:02:21 +06:00
parent 3c70adba9a
commit eaf71f9cc0
2 changed files with 2 additions and 0 deletions

View File

@ -4,6 +4,7 @@ class FeedbackMailer < ActionMailer::Base
default :to => FBM_CONFIG['email'], default :to => FBM_CONFIG['email'],
:cc => FBM_CONFIG['cc'], :cc => FBM_CONFIG['cc'],
:bcc => FBM_CONFIG['bcc'] :bcc => FBM_CONFIG['bcc']
default_url_options.merge!(:protocol => 'https') if APP_CONFIG['mailer_https_url']
include Resque::Mailer # send email async include Resque::Mailer # send email async

View File

@ -2,6 +2,7 @@
class UserMailer < ActionMailer::Base class UserMailer < ActionMailer::Base
default :from => APP_CONFIG['do-not-reply-email'] 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 include Resque::Mailer # send email async