diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-10-08 18:12:28 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-10-08 18:12:28 -0700 |
| commit | 992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062 (patch) | |
| tree | 83cde462f67aa72eff043e392756ded1ebdf424c /actionpack/lib/action_view | |
| parent | 5c42157cd83b022d05738c6759e38536f74fc572 (diff) | |
| download | rails-992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062.tar.gz rails-992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062.tar.bz2 rails-992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062.zip | |
Finish porting over the initializers to the app object and fix all the tests
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/paths.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb index 5524a3219a..23bde61f9c 100644 --- a/actionpack/lib/action_view/paths.rb +++ b/actionpack/lib/action_view/paths.rb @@ -1,8 +1,11 @@ module ActionView #:nodoc: class PathSet < Array #:nodoc: - def self.type_cast(obj) + def self.type_cast(obj, cache = nil) + # TODO: Clean this up if obj.is_a?(String) - cache = !defined?(Rails) || !Rails.respond_to?(:configuration) || Rails.configuration.cache_classes + if cache.nil? + cache = !defined?(Rails) || Rails.application.config.cache_classes + end FileSystemResolverWithFallback.new(obj, :cache => cache) else obj |