diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
commit | d9615928866115015e9ec48ac88a90869ef85d9b (patch) | |
tree | e6783aeeb36f1b8263d97d2548a39a4e5ee58fa6 /railties | |
parent | 276ec16007b03d0a527fb0b83a7ee0b81e460fa1 (diff) | |
parent | 82443ecfad5e756da922d6a166b0093c8a74d720 (diff) | |
download | rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.gz rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.bz2 rails-d9615928866115015e9ec48ac88a90869ef85d9b.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 637fe74313..10c2490624 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -370,8 +370,9 @@ Run `rake gems:install` to install the missing gems. def load_view_paths if configuration.frameworks.include?(:action_view) 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) + view_path = ActionView::Template::EagerPath.new(configuration.view_path) + ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) + ActionMailer::Base.template_root = view_path if configuration.frameworks.include?(:action_mailer) end end end @@ -473,7 +474,7 @@ Run `rake gems:install` to install the missing gems. # set to use Configuration#view_path. def initialize_framework_views if configuration.frameworks.include?(:action_view) - view_path = ActionView::PathSet::Path.new(configuration.view_path, false) + view_path = ActionView::Template::Path.new(configuration.view_path) ActionMailer::Base.template_root ||= view_path if configuration.frameworks.include?(:action_mailer) ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty? end |