diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-06 14:56:51 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-06 14:57:25 +0200 |
| commit | d42bb6843073b876e6a79e396a947c267fcbbf75 (patch) | |
| tree | ebaebf7d9a59bbf5531b89a8fe185e838dd5e33b | |
| parent | 894bdbd53dd82b6b28ff2672b85f57ed5ce97759 (diff) | |
| download | rails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.gz rails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.bz2 rails-d42bb6843073b876e6a79e396a947c267fcbbf75.zip | |
More updates to ivars list.
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 6 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 6 |
5 files changed, 11 insertions, 7 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f80e54f834..f00a0c8ae0 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -349,6 +349,8 @@ module ActionMailer #:nodoc: include AbstractController::Translation include AbstractController::AssetPaths + self.protected_instance_variables = %w(@_action_has_layout) + helper ActionMailer::MailHelper include ActionMailer::OldApi diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index 04728cafb0..bfa9499764 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -8,7 +8,7 @@ module ActionMailer included do extend ActionMailer::AdvAttrAccessor - self.protected_instance_variables.concat %w(@parts @mail_was_called) + self.protected_instance_variables.concat %w(@parts @mail_was_called @headers) # Specify the BCC addresses for the message adv_attr_accessor :bcc diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index d1b87b67ee..8f73e244d7 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -292,15 +292,15 @@ module AbstractController end end - attr_writer :action_has_layout + attr_internal_writer :action_has_layout def initialize(*) - @action_has_layout = true + @_action_has_layout = true super end def action_has_layout? - @action_has_layout + @_action_has_layout end private diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 09398c322a..ab2c532859 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -123,7 +123,7 @@ module AbstractController private DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w( - @_action_name @_response_body @_formats @_prefixes + @_action_name @_response_body @_formats @_prefixes @_config @_view_context_class @_view_renderer @_lookup_context ) diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 6ee5b41c8d..05dca445a4 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -18,8 +18,10 @@ module ActionController delegate :default_charset=, :to => "ActionDispatch::Response" end - self.protected_instance_variables = %w(@_headers @_params @_env @_response @_request - @_view_runtime @_stream @_url_options) + self.protected_instance_variables = %w( + @_status @_headers @_params @_env @_response @_request + @_view_runtime @_stream @_url_options @_action_has_layout + ) def rescue_action(env) raise env["action_dispatch.rescue.exception"] |