diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-28 19:03:41 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-28 19:03:41 +0000 |
| commit | 5029210914059faa65358b98a9c033a40e803c54 (patch) | |
| tree | 5138969cc573295c5a547eb500b0b4f790cf5924 /actionpack/lib | |
| parent | 2686286a702e910b7fef520d901d6e95c1f4bd4b (diff) | |
| download | rails-5029210914059faa65358b98a9c033a40e803c54.tar.gz rails-5029210914059faa65358b98a9c033a40e803c54.tar.bz2 rails-5029210914059faa65358b98a9c033a40e803c54.zip | |
Use Array.wrap() instead of Array() and handle action_view.cache_template_loading being false
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index c373afeac0..fe6053e574 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -188,7 +188,7 @@ module ActionView #:nodoc: cattr_accessor :cache_template_loading def self.cache_template_loading? - ActionController::Base.allow_concurrency || cache_template_loading || !ActiveSupport::Dependencies.load? + ActionController::Base.allow_concurrency || (cache_template_loading.nil? ? !ActiveSupport::Dependencies.load? : cache_template_loading) end attr_internal :request |