From 363a752c36122c92d528aee83262f3ee2db460ae Mon Sep 17 00:00:00 2001
From: Paul Rosania <paul.rosania@gmail.com>
Date: Fri, 5 Feb 2010 00:11:09 -0500
Subject: install ActionController::UrlFor before environment is parsed, to
provide ActionMailer#default_url_options=
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
actionmailer/lib/action_mailer/railtie.rb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index b5230f14ed..a3afc23e6a 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -5,6 +5,10 @@ module ActionMailer
class Railtie < Rails::Railtie
railtie_name :action_mailer
+ initializer "action_mailer.url_for", :before => :load_environment_config do |app|
+ ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController)
+ end
+
require "action_mailer/railties/subscriber"
subscriber ActionMailer::Railties::Subscriber.new
@@ -17,9 +21,5 @@ module ActionMailer
ActionMailer::Base.send "#{k}=", v
end
end
-
- initializer "action_mailer.url_for" do |app|
- ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController)
- end
end
-end
+end
\ No newline at end of file
--
cgit v1.2.3