Permalink
Browse files

Use Array.wrap() instead of Array() and handle action_view.cache_temp…

…late_loading being false
  • Loading branch information...
1 parent 2686286 commit 5029210914059faa65358b98a9c033a40e803c54 @lifo lifo committed Feb 28, 2009
@@ -188,7 +188,7 @@ class << self
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
@@ -111,7 +111,7 @@ def environment(data = nil, options = {}, &block)
"#{match}\n " << data
end
else
- Array(options[:env]).each do|env|
+ Array.wrap(options[:env]).each do|env|
append_file "config/environments/#{env}.rb", "\n#{data}"
end
end

0 comments on commit 5029210

Please sign in to comment.