aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/lookup_context.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-05 13:54:40 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-05 13:54:40 -0800
commit798b5efedb7c6f10e606cf87546af34c1744e76f (patch)
tree096b03b0972a630ec54e91840123a8a0eca76540 /actionpack/lib/action_view/lookup_context.rb
parent4751cc21e8893f1cec827c8dcdf876db43e91556 (diff)
parent2e487bc65816b1dec3d444a8a6f80aaef7eb68d3 (diff)
downloadrails-798b5efedb7c6f10e606cf87546af34c1744e76f.tar.gz
rails-798b5efedb7c6f10e606cf87546af34c1744e76f.tar.bz2
rails-798b5efedb7c6f10e606cf87546af34c1744e76f.zip
Merge pull request #4333 from rafaelfranca/patch-1
Change more Array.wrap calls
Diffstat (limited to 'actionpack/lib/action_view/lookup_context.rb')
-rw-r--r--actionpack/lib/action_view/lookup_context.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 3f07314dda..90d88ca967 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/module/remove_method'
@@ -29,7 +28,7 @@ module ActionView
end
def #{name}=(value)
- value = value.present? ? Array.wrap(value) : default_#{name}
+ value = value.present? ? Array(value) : default_#{name}
_set_detail(:#{name}, value) if value != @details[:#{name}]
end
@@ -102,7 +101,7 @@ module ActionView
# Whenever setting view paths, makes a copy so we can manipulate then in
# instance objects as we wish.
def view_paths=(paths)
- @view_paths = ActionView::PathSet.new(Array.wrap(paths))
+ @view_paths = ActionView::PathSet.new(Array(paths))
end
def find(name, prefixes = [], partial = false, keys = [], options = {})