diff options
author | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
commit | 8037fee9ff1dd13c421e6689229457c1ef084074 (patch) | |
tree | c60b2bf3e297be3e1bccb64ffd034acb137a7aa8 /railties/lib | |
parent | 908b5305d4446433433313e315deb4083c58233e (diff) | |
parent | 9f7eaea201b2f408d9effbf82f2731957e284adf (diff) | |
download | rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.gz rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.bz2 rails-8037fee9ff1dd13c421e6689229457c1ef084074.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/initializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 9148bddaf2..1aa71c31b5 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -401,7 +401,7 @@ Run `rake gems:install` to install the missing gems. def load_view_paths if configuration.frameworks.include?(:action_view) if configuration.cache_classes - view_path = ActionView::Template::FileSystemPath.new(configuration.view_path) + view_path = ActionView::FileSystemResolverWithFallback.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 |