diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-28 23:43:33 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-29 12:13:45 +0200 |
| commit | 7de994fa215e9f4c2856d85034bc4dd7b65d0c01 (patch) | |
| tree | 4455776ba6a5ef6d07d4eb9900cea9f310b4b6c7 /actionmailer | |
| parent | 55c9109b5a4e5018973d3f9856d0ba15123ae3a9 (diff) | |
| download | rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.tar.gz rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.tar.bz2 rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.zip | |
Port all remaining self.protected_instance_variables to class methods
Diffstat (limited to 'actionmailer')
| -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) |