diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-08-29 05:57:11 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-08-29 05:57:11 -0700 |
| commit | 0b3a078a24819fae8b9df0b0f63a264cece70a7c (patch) | |
| tree | 6b5b51f8a024b87c596bc162fd3c8b6b11dd383c /actionmailer/lib/action_mailer | |
| parent | a7b845c27f32b6e00a7bf87aa555c41808b3e1a8 (diff) | |
| parent | 7de994fa215e9f4c2856d85034bc4dd7b65d0c01 (diff) | |
| download | rails-0b3a078a24819fae8b9df0b0f63a264cece70a7c.tar.gz rails-0b3a078a24819fae8b9df0b0f63a264cece70a7c.tar.bz2 rails-0b3a078a24819fae8b9df0b0f63a264cece70a7c.zip | |
Merge pull request #12062 from strzalek/default-protected-vars
Port all remaining self.protected_instance_variables to class methods
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index ada86fbc4f..9dcd4bf554 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -373,8 +373,6 @@ module ActionMailer include AbstractController::AssetPaths include AbstractController::Callbacks - self.protected_instance_variables = [:@_action_has_layout] - helper ActionMailer::MailHelper private_class_method :new #:nodoc: @@ -387,6 +385,10 @@ module ActionMailer parts_order: [ "text/plain", "text/enriched", "text/html" ] }.freeze + def self.default_protected_instance_vars + super.concat [:@_action_has_layout] + end + class << self # Register one or more Observers which will be notified when mail is delivered. def register_observers(*observers) |