Remove the need for a special action_mailer.url_for initializer that loads before anything else

1 files changed, 2 insertions, 4 deletions

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 882e078d1b..0730167a3e 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -5,10 +5,6 @@ module ActionMailer
   class Railtie < Rails::Railtie
     config.action_mailer = ActiveSupport::OrderedOptions.new
 
-    initializer "action_mailer.url_for", :before => :load_environment_config do |app|
-      ActiveSupport.on_load(:action_mailer) { include app.routes.url_helpers }
-    end
-
     require "action_mailer/railties/log_subscriber"
     log_subscriber :action_mailer, ActionMailer::Railties::LogSubscriber.new
 
@@ -18,6 +14,8 @@ module ActionMailer
 
     initializer "action_mailer.set_configs" do |app|
       ActiveSupport.on_load(:action_mailer) do
+        include app.routes.url_helpers
+
         app.config.action_mailer.each do |k,v|
           send "#{k}=", v
         end