diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 18:03:27 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 18:03:27 -0700 |
| commit | a06e9b46021acac1832b7df672213e5218ec29b5 (patch) | |
| tree | e0abfb455bc3004bb61223f3d82e4e75df94bed9 /actionpack/lib/action_controller | |
| parent | 4db10bce7b5ca794c4d408de3b8002bf58233bb7 (diff) | |
| download | rails-a06e9b46021acac1832b7df672213e5218ec29b5.tar.gz rails-a06e9b46021acac1832b7df672213e5218ec29b5.tar.bz2 rails-a06e9b46021acac1832b7df672213e5218ec29b5.zip | |
Ruby 1.9: helper path may be a pathname, so convert to a string before quoting for regexp
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb index 1110d7c117..b6d4fb1284 100644 --- a/actionpack/lib/action_controller/metal/helpers.rb +++ b/actionpack/lib/action_controller/metal/helpers.rb @@ -104,7 +104,7 @@ module ActionController def all_application_helpers helpers = [] helpers_path.each do |path| - extract = /^#{Regexp.quote(path)}\/?(.*)_helper.rb$/ + extract = /^#{Regexp.quote(path.to_s)}\/?(.*)_helper.rb$/ helpers += Dir["#{path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') } end helpers.sort! |