diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-28 17:42:15 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-28 17:42:15 +0000 |
| commit | 8607740a29d0f9ceb2ca21c9ef714f74b64d4a88 (patch) | |
| tree | 858c35e070ecfdc00ea70e8a1379a4420ee0f811 /actionpack/lib | |
| parent | c653f700d3afb1208b15fb7fec6250bf3a3f0321 (diff) | |
| download | rails-8607740a29d0f9ceb2ca21c9ef714f74b64d4a88.tar.gz rails-8607740a29d0f9ceb2ca21c9ef714f74b64d4a88.tar.bz2 rails-8607740a29d0f9ceb2ca21c9ef714f74b64d4a88.zip | |
Ensure the old behaviour is retained when action_view.cache_template_loading is not set explicitly
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 65b2062337..c373afeac0 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -183,12 +183,12 @@ module ActionView #:nodoc: cattr_accessor :debug_rjs # Specify whether templates should be cached. Otherwise the file we be read everytime it is accessed. - # Automaticaly reloading templates are not thread safe and should only be used in development mode. - @@cache_template_loading = false + # Automatically reloading templates are not thread safe and should only be used in development mode. + @@cache_template_loading = nil cattr_accessor :cache_template_loading def self.cache_template_loading? - ActionController::Base.allow_concurrency || cache_template_loading + ActionController::Base.allow_concurrency || cache_template_loading || !ActiveSupport::Dependencies.load? end attr_internal :request |