diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 18:59:33 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 18:59:33 +0100 |
| commit | 6fa9957e0e83f327aaffe34679a5752fc2343fae (patch) | |
| tree | 83b606852608845853fc5a005949812dfa5160d6 /railties | |
| parent | f2ee056873b84f8917e72d87181e1a9f5f653342 (diff) | |
| parent | 4d910b033379727e5e7355590c50c72fc75e56db (diff) | |
| download | rails-6fa9957e0e83f327aaffe34679a5752fc2343fae.tar.gz rails-6fa9957e0e83f327aaffe34679a5752fc2343fae.tar.bz2 rails-6fa9957e0e83f327aaffe34679a5752fc2343fae.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/initializer.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 0c06d1bf21..a69898e2c5 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -372,9 +372,10 @@ Run `rake gems:install` to install the missing gems. def load_view_paths if configuration.frameworks.include?(:action_view) - ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes - ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller) - ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer) + if configuration.cache_classes + ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller) + ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer) + end end end |