diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-05 13:54:40 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-05 13:54:40 -0800 |
| commit | 798b5efedb7c6f10e606cf87546af34c1744e76f (patch) | |
| tree | 096b03b0972a630ec54e91840123a8a0eca76540 /actionpack/lib/action_controller/metal/helpers.rb | |
| parent | 4751cc21e8893f1cec827c8dcdf876db43e91556 (diff) | |
| parent | 2e487bc65816b1dec3d444a8a6f80aaef7eb68d3 (diff) | |
| download | rails-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_controller/metal/helpers.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/helpers.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb index 50d7aac300..d070eaae5d 100644 --- a/actionpack/lib/action_controller/metal/helpers.rb +++ b/actionpack/lib/action_controller/metal/helpers.rb @@ -1,4 +1,3 @@ -require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/class/attribute' module ActionController @@ -94,7 +93,7 @@ module ActionController def all_helpers_from_path(path) helpers = [] - Array.wrap(path).each do |_path| + Array(path).each do |_path| extract = /^#{Regexp.quote(_path.to_s)}\/?(.*)_helper.rb$/ helpers += Dir["#{_path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') } end |