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 /actionpack/lib/action_view/paths.rb | |
| 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 'actionpack/lib/action_view/paths.rb')
| -rw-r--r-- | actionpack/lib/action_view/paths.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb index 95c56faf9c..074b475819 100644 --- a/actionpack/lib/action_view/paths.rb +++ b/actionpack/lib/action_view/paths.rb @@ -3,7 +3,7 @@ module ActionView #:nodoc: def self.type_cast(obj) if obj.is_a?(String) cache = !defined?(Rails) || !Rails.respond_to?(:configuration) || Rails.configuration.cache_classes - Template::FileSystemPathWithFallback.new(obj, :cache => cache) + FileSystemResolverWithFallback.new(obj, :cache => cache) else obj end |