diff options
author | Sam Granieri <sam@samgranieri.com> | 2008-07-24 13:51:54 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-07-24 13:51:54 -0500 |
commit | 11fdcf88c2aea72ec84c5d4ab05986f5d35a9a81 (patch) | |
tree | 16462af165a95e59164310eb673fecd5d13763bf /railties/lib | |
parent | a87462afcb6c642e59bfcd2e11e3351e2b718c38 (diff) | |
download | rails-11fdcf88c2aea72ec84c5d4ab05986f5d35a9a81.tar.gz rails-11fdcf88c2aea72ec84c5d4ab05986f5d35a9a81.tar.bz2 rails-11fdcf88c2aea72ec84c5d4ab05986f5d35a9a81.zip |
Check for ActionMailer and ActionController before attempting to eager load their view paths
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/initializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 44863ab026..32411e8928 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -341,8 +341,8 @@ Run `rake gems:install` to install the missing gems. def load_view_paths ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes - ActionMailer::Base.template_root.load - ActionController::Base.view_paths.load + ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer) + ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller) end # Eager load application classes |