Include AV::Layouts directly in AM::Base

No need to do this in railtie as AM depends on AV either way
Andersond11 · Dec 5, 2013 · e064658 · e064658
1 parent d8888b9
commit e064658
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -373,6 +373,8 @@ class Base < AbstractController::Base
     include AbstractController::AssetPaths
     include AbstractController::Callbacks
 
+    include ActionView::Layouts
+
     PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [:@_action_has_layout]
 
     def _protected_ivars # :nodoc:

diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb
@@ -42,12 +42,6 @@ class Railtie < Rails::Railtie # :nodoc:
       end
     end
 
-    initializer "action_view.setup_action_mailer", before: :add_view_paths do |app|
-      ActiveSupport.on_load(:action_mailer) do
-        ActionMailer::Base.send(:include, ActionView::Layouts)
-      end
-    end
-
     rake_tasks do
       load "action_view/tasks/dependencies.rake"
     end