Merge branch 'master' of github.com:lifo/docrails

1 files changed, 4 insertions, 4 deletions

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 4ed70503fd..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
\ No newline at end of file