aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorAlexey Vakhov <vakhov@gmail.com>2012-02-25 01:29:00 +0400
committerAlexey Vakhov <vakhov@gmail.com>2012-05-22 00:28:34 +0400
commite4569b50d1d20f52633a3fe036014acd5117fa73 (patch)
treebdd7b56cecaa1ac210ba4fa46643bc010d411685 /actionpack/lib/abstract_controller
parent776ea1090fb9ba4353035d4983cf1926a67b3294 (diff)
downloadrails-e4569b50d1d20f52633a3fe036014acd5117fa73.tar.gz
rails-e4569b50d1d20f52633a3fe036014acd5117fa73.tar.bz2
rails-e4569b50d1d20f52633a3fe036014acd5117fa73.zip
Add instance_accessor option to class_attribute
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/layouts.rb3
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