diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index fada9cb9..b8da239e 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -9,9 +9,7 @@ class Mailer < ActionMailer::Base layout 'email' # Use views/layouts/email.txt.erb - default from: "Foodsoft <#{FoodsoftConfig[:email_sender]}>", - sender: FoodsoftConfig[:email_sender], - errors_to: FoodsoftConfig[:email_sender] + default from: "Foodsoft <#{FoodsoftConfig[:email_sender]}>" # Sends an email with instructions on how to reset the password. # Assumes user.setResetPasswordToken has been successfully called already. @@ -65,8 +63,6 @@ class Mailer < ActionMailer::Base mail :to => FoodsoftConfig[:notification]["error_recipients"], :from => "#{show_user user} <#{user.email}>", - :sender => FoodsoftConfig[:notification]["sender_address"], - :errors_to => FoodsoftConfig[:notification]["sender_address"], :subject => "[#{FoodsoftConfig[:name]}] " + I18n.t('mailer.feedback.subject', :email => user.email) end