diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-08-23 18:31:29 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:13 +0200 |
| commit | 98ab4ded376c3d04540bdbdfe6dbbf88c0738701 (patch) | |
| tree | 332af78016a4c9d5f5c682530af9449fc4d8f447 /actionpack/lib/action_controller/railties/paths.rb | |
| parent | 8ec2175aee93ecfd928de67c0a125bccc5e1c152 (diff) | |
| download | rails-98ab4ded376c3d04540bdbdfe6dbbf88c0738701.tar.gz rails-98ab4ded376c3d04540bdbdfe6dbbf88c0738701.tar.bz2 rails-98ab4ded376c3d04540bdbdfe6dbbf88c0738701.zip | |
Set only helpers_path on inherited hook in action_controller/railtie.rb and use helper(:all) just after that
Diffstat (limited to 'actionpack/lib/action_controller/railties/paths.rb')
| -rw-r--r-- | actionpack/lib/action_controller/railties/paths.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb index 095beb7a2f..81d03f5e73 100644 --- a/actionpack/lib/action_controller/railties/paths.rb +++ b/actionpack/lib/action_controller/railties/paths.rb @@ -14,12 +14,10 @@ module ActionController paths = app.config.paths options = app.config.action_controller - options.assets_dir ||= paths.public.to_a.first - options.javascripts_dir ||= paths.public.javascripts.to_a.first - options.stylesheets_dir ||= paths.public.stylesheets.to_a.first - options.page_cache_directory ||= paths.public.to_a.first options.helpers_path ||= paths.app.helpers.to_a options.each { |k,v| klass.send("#{k}=", v) } + + klass.helper :all end end end |