Moved default url options setting to _load_config initializer.

Nick Recobra
1 parent f79e308d
Showing 2 changed files with 3 additions and 4 deletions Show diff stats
config/initializers/_load_config.rb
config/initializers/default_url_options.rb
@@ -15,4 +15,6 @@ else
 end
 # Set config specific values
-ActionMailer::Base.default_url_options[:host] = Errbit::Config.host
 \ No newline at end of file
+(Errbit::Application.config.action_mailer.default_url_options ||= {}).tap do |default|
+  default.merge! :host => Errbit::Config.host if default[:host].blank?
+end
 \ No newline at end of file
@@ -1,3 +0,0 @@
-(Errbit::Application.config.action_mailer.default_url_options ||= {}).tap do |default|
-  default.merge! :host => Errbit::Config.host if default[:host].blank?
-end
	@@ -15,4 +15,6 @@ else		@@ -15,4 +15,6 @@ else
15	end	15	end
16		16
17	# Set config specific values	17	# Set config specific values
18	-ActionMailer::Base.default_url_options[:host] = Errbit::Config.host
19	\ No newline at end of file	18	\ No newline at end of file
		19	+(Errbit::Application.config.action_mailer.default_url_options \|\|= {}).tap do \|default\|
		20	+ default.merge! :host => Errbit::Config.host if default[:host].blank?
		21	+end
20	\ No newline at end of file	22	\ No newline at end of file
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-(Errbit::Application.config.action_mailer.default_url_options \|\|= {}).tap do \|default\|
2	- default.merge! :host => Errbit::Config.host if default[:host].blank?
3	-end