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 /actionpack/lib/abstract_controller | |
| parent | 894bdbd53dd82b6b28ff2672b85f57ed5ce97759 (diff) | |
| download | rails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.gz rails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.bz2 rails-d42bb6843073b876e6a79e396a947c267fcbbf75.zip | |
More updates to ivars list.
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 6 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 2 |
2 files changed, 4 insertions, 4 deletions
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 ) |