diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-06-11 09:11:08 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-06-11 09:36:41 +0100 |
| commit | f728e57d2204a429f5282856ec89d4e047e72957 (patch) | |
| tree | aadaafc6e6ee750a8d380753a9f7e53aa71817f8 /actionpack/lib/action_controller | |
| parent | 3f594299c85ef111ac479b845fa8c7e37563ff66 (diff) | |
| download | rails-f728e57d2204a429f5282856ec89d4e047e72957.tar.gz rails-f728e57d2204a429f5282856ec89d4e047e72957.tar.bz2 rails-f728e57d2204a429f5282856ec89d4e047e72957.zip | |
Make sure cache_template_loading works and don't use to_prepare callback
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index f20d9cc40f..fe4f6b4a7e 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -21,10 +21,6 @@ module ActionController end end - to_prepare :reload_view_path_cache do - ActionView::TemplateFinder.reload! - end - if defined?(ActiveRecord) before_dispatch { ActiveRecord::Base.verify_active_connections! } to_prepare(:activerecord_instantiate_observers) { ActiveRecord::Base.instantiate_observers } @@ -138,6 +134,7 @@ module ActionController run_callbacks :prepare_dispatch Routing::Routes.reload + ActionView::TemplateFinder.reload! unless ActionView::Base.cache_template_loading end # Cleanup the application by clearing out loaded classes so they can |