From 03b307d359e3abdb57e5376c8b195b6a9f1cf5b6 Mon Sep 17 00:00:00 2001 From: wvengen Date: Wed, 3 Sep 2014 11:43:04 +0200 Subject: [PATCH] fix more sensible mailer option defaults --- config/initializers/load_app_config.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/config/initializers/load_app_config.rb b/config/initializers/load_app_config.rb index 9501a48a..216fb4e7 100644 --- a/config/initializers/load_app_config.rb +++ b/config/initializers/load_app_config.rb @@ -4,15 +4,11 @@ require 'foodsoft_config' FoodsoftConfig.init -# Set action mailer default host for url generating -url_options = { - :host => FoodsoftConfig[:host], - :protocol => FoodsoftConfig[:protocol] -} -url_options.merge!({:port => FoodsoftConfig[:port]}) if FoodsoftConfig[:port] - Foodsoft::Application.configure do - config.action_mailer.default_url_options = url_options + # Set action mailer default host for url generating + [:protocol, :host, :port].each do |k| + config.action_mailer.default_url_options[k] = FoodsoftConfig[k] if FoodsoftConfig[k] + end if %w(production).include? Rails.env # Configuration of the exception_notification plugin