aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/view_paths.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-06-10 19:39:09 +0200
committerJosé Valim <jose.valim@gmail.com>2010-06-10 19:39:09 +0200
commitb67ec8ba20099c8b39bf344f385bbbd2b9c8f47d (patch)
tree008a576bb72baffd49b2483b3b08e181933e29c1 /actionpack/lib/abstract_controller/view_paths.rb
parentc4d6245e875bbb276c122a5a401422d341dac4df (diff)
downloadrails-b67ec8ba20099c8b39bf344f385bbbd2b9c8f47d.tar.gz
rails-b67ec8ba20099c8b39bf344f385bbbd2b9c8f47d.tar.bz2
rails-b67ec8ba20099c8b39bf344f385bbbd2b9c8f47d.zip
class_attribute is not a direct replacement of class_inheritable_*.
If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance.
Diffstat (limited to 'actionpack/lib/abstract_controller/view_paths.rb')
-rw-r--r--actionpack/lib/abstract_controller/view_paths.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index b331eb51b6..b552a649d1 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -5,6 +5,7 @@ module AbstractController
included do
class_attribute :_view_paths
self._view_paths = ActionView::PathSet.new
+ self._view_paths.freeze
end
delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
@@ -61,7 +62,7 @@ module AbstractController
# paths<ViewPathSet, Object>:: If a ViewPathSet is provided, use that;
# otherwise, process the parameter into a ViewPathSet.
def view_paths=(paths)
- self._view_paths = paths.is_a?(ActionView::PathSet) ? paths : ActionView::Base.process_view_paths(paths)
+ self._view_paths = ActionView::Base.process_view_paths(paths)
self._view_paths.freeze
end
end