diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-21 13:43:36 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-21 13:43:36 -0700 |
| commit | f260dc53be27448d9052098369d31d8ecd626839 (patch) | |
| tree | bdd7b56cecaa1ac210ba4fa46643bc010d411685 /actionpack | |
| parent | 776ea1090fb9ba4353035d4983cf1926a67b3294 (diff) | |
| parent | e4569b50d1d20f52633a3fe036014acd5117fa73 (diff) | |
| download | rails-f260dc53be27448d9052098369d31d8ecd626839.tar.gz rails-f260dc53be27448d9052098369d31d8ecd626839.tar.bz2 rails-f260dc53be27448d9052098369d31d8ecd626839.zip | |
Merge pull request #5156 from avakhov/class-attribute-instance-accessor
Add instance_accessor option to class_attribute
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index bc9f6fc3e8..c1b3994035 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -203,8 +203,7 @@ module AbstractController include Rendering included do - class_attribute :_layout, :_layout_conditions, - :instance_reader => false, :instance_writer => false + class_attribute :_layout, :_layout_conditions, :instance_accessor => false self._layout = nil self._layout_conditions = {} _write_layout_method |