diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-09-02 23:05:42 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-09-02 23:18:02 +0200 |
| commit | 40fcb9e82220fe9a7a3b0b3aeee61f92f00942c2 (patch) | |
| tree | e71a52d4352c0913b95ed2503b5c7e61ffa51d4e /actionmailer/lib | |
| parent | 90ea6f928ce0f0efef3109045a74469c4a3e3f99 (diff) | |
| download | rails-40fcb9e82220fe9a7a3b0b3aeee61f92f00942c2.tar.gz rails-40fcb9e82220fe9a7a3b0b3aeee61f92f00942c2.tar.bz2 rails-40fcb9e82220fe9a7a3b0b3aeee61f92f00942c2.zip | |
Revert "Port all remaining self.protected_instance_variables to class methods"
This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 9dcd4bf554..ada86fbc4f 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 + self.protected_instance_variables = [:@_action_has_layout] + helper ActionMailer::MailHelper private_class_method :new #:nodoc: @@ -385,10 +387,6 @@ 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) |