diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
| commit | 6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52 (patch) | |
| tree | 96bd668692b62d3829322232877b70c9011ce446 /actionpack/lib/action_controller/railties/paths.rb | |
| parent | f326221c701e4f9d991e3eadcc793a73795fb218 (diff) | |
| parent | 7c51d1fcf9dc504c2dfd6e7184bbe8186f09819d (diff) | |
| download | rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.gz rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.bz2 rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/railties/paths.rb')
| -rw-r--r-- | actionpack/lib/action_controller/railties/paths.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb index 7a59d4f2f3..699c44c62c 100644 --- a/actionpack/lib/action_controller/railties/paths.rb +++ b/actionpack/lib/action_controller/railties/paths.rb @@ -13,7 +13,9 @@ module ActionController end klass.helpers_path = paths - klass.helper :all if klass.superclass == ActionController::Base + if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers + klass.helper :all + end end end end |