aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/helpers.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-05 17:13:27 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-05 17:13:27 -0300
commit56715c49d4788db81f2fd5e6920b751c8da2352b (patch)
tree524e5631392bc7786fe06b54b6d2e35836fc6002 /actionpack/lib/action_controller/metal/helpers.rb
parentec28c4fb242a9bf0632bb4dac0d0a2d949eab1b3 (diff)
downloadrails-56715c49d4788db81f2fd5e6920b751c8da2352b.tar.gz
rails-56715c49d4788db81f2fd5e6920b751c8da2352b.tar.bz2
rails-56715c49d4788db81f2fd5e6920b751c8da2352b.zip
Use Kernel#Array in ActionController::Helpers
Diffstat (limited to 'actionpack/lib/action_controller/metal/helpers.rb')
-rw-r--r--actionpack/lib/action_controller/metal/helpers.rb3
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