diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
| commit | 7942e909608f24db0365943c5d9ad51cbb4d27b5 (patch) | |
| tree | 6a9b51155b9220dbf98d4b1c78d8edccabd231c5 /railties/lib/rails/engine.rb | |
| parent | 36eb1a686c831d5a14998bb9ac7cc60efa363373 (diff) | |
| parent | ae93789d9ad9095ca21784287464b760db12a095 (diff) | |
| download | rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.gz rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.bz2 rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.zip | |
Merge master.
Diffstat (limited to 'railties/lib/rails/engine.rb')
| -rw-r--r-- | railties/lib/rails/engine.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 8f5040ea13..85b4ff8470 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -97,8 +97,8 @@ module Rails initializer :add_view_paths do views = paths.app.views.to_a - ActionController::Base.prepend_view_path(views) if defined?(ActionController::Base) - ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer::Base) + ActionController.base_hook { prepend_view_path(views) } if defined?(ActionController) + ActionMailer.base_hook { prepend_view_path(views) } if defined?(ActionMailer) end initializer :add_metals do |app| |