diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-12-29 19:27:19 -0600 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-01 00:13:11 -0800 |
| commit | ab7c25d51174779547ab74bcd23e40204891e370 (patch) | |
| tree | 629a893593b5114f3aca9f1f16f9fe09362f19d5 /railties | |
| parent | 860dd77006b66a0b0805e3e6edc6b80739f6fca3 (diff) | |
| download | rails-ab7c25d51174779547ab74bcd23e40204891e370.tar.gz rails-ab7c25d51174779547ab74bcd23e40204891e370.tar.bz2 rails-ab7c25d51174779547ab74bcd23e40204891e370.zip | |
Clean up view path cruft and split path implementations into Template::Path and Template::EagerPath
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 |