diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-05 07:25:17 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-05 07:25:17 -0800 |
| commit | 5086c8c2113b67eb893cb34882e06c8b83e7951c (patch) | |
| tree | 1b84176e7e3fcfc2487a3310f49a87e2cd903ee5 /actionmailer | |
| parent | 23d555a0abcbe5bb143928d33aaf66b38f63338b (diff) | |
| parent | d6eda3ef3c59e377670442cd7f36460dbdf389f5 (diff) | |
| download | rails-5086c8c2113b67eb893cb34882e06c8b83e7951c.tar.gz rails-5086c8c2113b67eb893cb34882e06c8b83e7951c.tar.bz2 rails-5086c8c2113b67eb893cb34882e06c8b83e7951c.zip | |
Merge pull request #13189 from strzalek/retain-ap-av-dep
Retain ActionPack dependency on ActionView. Fixes #12979.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionmailer/test/i18n_with_controller_test.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 6f8ae05539..5723b2cc1b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -373,6 +373,8 @@ module ActionMailer 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/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb index ab5eaaa9d5..14a1b11b6d 100644 --- a/actionmailer/test/i18n_with_controller_test.rb +++ b/actionmailer/test/i18n_with_controller_test.rb @@ -15,9 +15,6 @@ class I18nTestMailer < ActionMailer::Base end end -# Emulate AV railtie -ActionController::Base.superclass.send(:include, ActionView::Layouts) - class TestController < ActionController::Base def send_mail I18nTestMailer.mail_with_i18n_subject("test@localhost").deliver |